Merge pull request #56 from sveltespot/fix_issue_54

Fix #54

Author: penberg

src/lib.rs

@@ -440,22 +440,19 @@ fn stmt_is_dml(sql: &str) -> bool {
 fn convert_row(py: Python, row: libsql_core::Row, column_count: i32) -> PyResult<&PyTuple> {
     let mut elements: Vec<Py<PyAny>> = vec![];
     for col_idx in 0..column_count {
-        let col_type = row.column_type(col_idx).map_err(to_py_err)?;
-        let value = match col_type {
-            libsql::ValueType::Integer => {
-                let value = row.get::<i32>(col_idx).map_err(to_py_err)?;
+        let libsql_value = row.get_value(col_idx).map_err(to_py_err)?;
+        let value = match libsql_value {
+            libsql_core::Value::Integer(v) => {
+                let value = v as i32;
                 value.into_py(py)
             }
-            libsql::ValueType::Real => {
-                let value = row.get::<f64>(col_idx).map_err(to_py_err)?;
+            libsql_core::Value::Real(v) => v.into_py(py),
+            libsql_core::Value::Text(v) => v.into_py(py),
+            libsql_core::Value::Blob(v) => {
+                let value = v.as_slice();
                 value.into_py(py)
             }
-            libsql::ValueType::Blob => todo!("blobs not supported"),
-            libsql::ValueType::Text => {
-                let value = row.get::<String>(col_idx).map_err(to_py_err)?;
-                value.into_py(py)
-            }
-            libsql::ValueType::Null => py.None(),
+            libsql_core::Value::Null => py.None(),
         };
         elements.push(value);
     }

tests/test_suite.py

@@ -159,7 +159,31 @@ def test_in_transaction(provider):
     cur.execute("INSERT INTO users VALUES (?, ?)", (2, 'bob@example.com'))
     assert conn.in_transaction == True
 
+@pytest.mark.parametrize("provider", ["libsql-remote", "libsql", "sqlite"])
+def test_fetch_expression(provider):
+    dbname = "/tmp/test.db" if provider == "libsql-remote" else ":memory:"
+    try:
+        conn = connect(provider, dbname)
+    except Exception as e:
+        pytest.skip(str(e))
+    cur = conn.cursor()
+    cur.execute("DROP TABLE IF EXISTS users")
+    cur.execute("CREATE TABLE users (id INTEGER, email TEXT)")
+    cur.execute("INSERT INTO users VALUES (1, 'alice@example.com')")
+    res = cur.execute("SELECT QUOTE(email) FROM users")
+    assert [("'alice@example.com'",)] == res.fetchall()
+
+
 def connect(provider, database, isolation_level='DEFERRED'):
+    if provider == "libsql-remote":
+        from urllib import request
+        try:
+            res = request.urlopen("http://localhost:8080/v2")
+        except Exception as _:
+            raise Exception("libsql-remote server is not running")
+        if res.getcode() != 200:
+            raise Exception("libsql-remote server is not running")
+        return libsql_experimental.connect(database, sync_url="http://localhost:8080", auth_token="")
     if provider == "libsql":
         return libsql_experimental.connect(database, isolation_level = isolation_level)
     if provider == "sqlite":