Skip to content

Commit 19db94e

Browse files
authored
Merge pull request #34 from tursodatabase/bump-libsql
Bump libsql dependency
2 parents 225aaa9 + 413dc31 commit 19db94e

3 files changed

Lines changed: 62 additions & 56 deletions

File tree

Cargo.lock

Lines changed: 57 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ crate-type = ["cdylib"]
99

1010
[dependencies]
1111
pyo3 = "0.19.0"
12-
libsql = { git = "https://github.com/tursodatabase/libsql/", rev = "52814a9841792330d290f950f2c49f49f6c77e42" }
12+
libsql = { git = "https://github.com/tursodatabase/libsql/", rev = "b01500237f2a1cd137681ef1d86edf482e848c29" }
1313
tokio = { version = "1.29.1", features = [ "rt-multi-thread" ] }
1414
tracing-subscriber = "0.3"

src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ fn connect(
4343
auth_token,
4444
Some(ver),
4545
true,
46+
None,
4647
);
4748
let result = rt.block_on(fut);
4849
result.map_err(to_py_err)?
@@ -220,7 +221,7 @@ impl Cursor {
220221
let mut rows = self_.rows.borrow_mut();
221222
match rows.as_mut() {
222223
Some(rows) => {
223-
let row = rows.next().map_err(to_py_err)?;
224+
let row = self_.rt.block_on(rows.next()).map_err(to_py_err)?;
224225
match row {
225226
Some(row) => {
226227
let row = convert_row(self_.py(), row, rows.column_count())?;
@@ -244,7 +245,7 @@ impl Cursor {
244245
// done before iterating.
245246
if !*self_.done.borrow() {
246247
for _ in 0..size {
247-
let row = rows.next().map_err(to_py_err)?;
248+
let row = self_.rt.block_on(rows.next()).map_err(to_py_err)?;
248249
match row {
249250
Some(row) => {
250251
let row = convert_row(self_.py(), row, rows.column_count())?;
@@ -269,7 +270,7 @@ impl Cursor {
269270
Some(rows) => {
270271
let mut elements: Vec<Py<PyAny>> = vec![];
271272
loop {
272-
let row = rows.next().map_err(to_py_err)?;
273+
let row = self_.rt.block_on(rows.next()).map_err(to_py_err)?;
273274
match row {
274275
Some(row) => {
275276
let row = convert_row(self_.py(), row, rows.column_count())?;

0 commit comments

Comments
 (0)