feat: support bind variant into params in cursor api (#700)

sundy-li · web-flow · commit c6bad5b4ff6d · 2025-11-06T18:46:34.000+08:00
* feat: support bind variant into params in cursor api

* feat: support bind variant into params in cursor api

* feat: support bind variant into params in cursor api

* feat: support bind variant into params in cursor api

* feat: support bind variant into params in cursor api
diff --git a/bindings/python/package/databend_driver/__init__.pyi b/bindings/python/package/databend_driver/__init__.pyi
@@ -124,10 +124,10 @@ class BlockingDatabendCursor:
     def rowcount(self) -> int: ...
     def close(self) -> None: ...
     def execute(
-        self, operation: str, params: list[str] | tuple[str] = None
+        self, operation: str, params: list[any] | tuple[any] = None
     ) -> None | int: ...
     def executemany(
-        self, operation: str, params: list[list[str] | tuple[str]]
+        self, operation: str, params: list[list[any] | tuple[any]]
     ) -> None | int: ...
     def fetchone(self) -> Row | None: ...
     def fetchmany(self, size: int = 1) -> list[Row]: ...
diff --git a/bindings/python/src/blocking.rs b/bindings/python/src/blocking.rs
@@ -501,9 +501,35 @@ fn to_csv_field(v: Bound<PyAny>) -> PyResult<String> {
             } else if let Ok(v) = v.extract::<f64>() {
                 Ok(v.to_string())
             } else {
-                Err(PyAttributeError::new_err(format!(
-                    "Invalid parameter type for: {v:?}, expected str, bool, int or float"
-                )))
+                // Try to convert dict-like objects to JSON string
+                if let Ok(dict) = v.downcast::<pyo3::types::PyDict>() {
+                    // Convert Python dict to JSON string
+                    let json_string = Python::with_gil(|py| {
+                        let json_module = py.import("json")?;
+                        let dumps = json_module.getattr("dumps")?;
+                        let result = dumps.call1((dict,))?;
+                        result.extract::<String>()
+                    })?;
+                    Ok(json_string)
+                } else {
+                    // Try to convert any object to string using its __str__ method
+                    match v.call_method0("__str__") {
+                        Ok(str_obj) => {
+                            if let Ok(s) = str_obj.extract::<String>() {
+                                Ok(s)
+                            } else {
+                                Err(PyAttributeError::new_err(format!(
+                                    "Failed to convert object to string: {v:?}"
+                                )))
+                            }
+                        }
+                        Err(_) => {
+                            Err(PyAttributeError::new_err(format!(
+                                "Invalid parameter type for: {v:?}, expected str, bool, int, float, dict, or object with __str__ method"
+                            )))
+                        }
+                    }
+                }
             }
         }
         Err(e) => Err(e.into()),
diff --git a/bindings/python/tests/cursor/steps/binding.py b/bindings/python/tests/cursor/steps/binding.py
@@ -62,7 +62,8 @@ def _(context):
             s   String,
             s2  String,
             d   Date,
-            t   DateTime
+            t   DateTime,
+            v   Variant
         )
         """
     )
@@ -167,18 +168,49 @@ def _(context):
 
 @then("Insert and Select should be equal")
 def _(context):
+    values = []
+    if DRIVER_VERSION <= (0, 30, 3):
+        print("SKIP")
+        return
     context.cursor.execute(
         r"""
         INSERT INTO test VALUES
-            (-1, 1, 1.0, '\'', NULL, '2011-03-06', '2011-03-06 06:20:00'),
-            (-2, 2, 2.0, '"', '', '2012-05-31', '2012-05-31 11:20:00'),
-            (-3, 3, 3.0, '\\', 'NULL', '2016-04-04', '2016-04-04 11:30:00')
+            (-1, 1, 1.0, '\'', NULL, '2011-03-06', '2011-03-06 06:20:00', {'a': 1}),
+            (-2, 2, 2.0, '"', '', '2012-05-31', '2012-05-31 11:20:00', {'a': 2}),
+            (-3, 3, 3.0, '\\', 'NULL', '2016-04-04', '2016-04-04 11:30:00', {'a': 3})
         """
     )
     expected = [
-        (-1, 1, 1.0, "'", None, date(2011, 3, 6), datetime(2011, 3, 6, 6, 20)),
-        (-2, 2, 2.0, '"', "", date(2012, 5, 31), datetime(2012, 5, 31, 11, 20)),
-        (-3, 3, 3.0, "\\", "NULL", date(2016, 4, 4), datetime(2016, 4, 4, 11, 30)),
+        (
+            -1,
+            1,
+            1.0,
+            "'",
+            None,
+            date(2011, 3, 6),
+            datetime(2011, 3, 6, 6, 20),
+            '{"a":1}',
+        ),
+        (
+            -2,
+            2,
+            2.0,
+            '"',
+            "",
+            date(2012, 5, 31),
+            datetime(2012, 5, 31, 11, 20),
+            '{"a":2}',
+        ),
+        (
+            -3,
+            3,
+            3.0,
+            "\\",
+            "NULL",
+            date(2016, 4, 4),
+            datetime(2016, 4, 4, 11, 30),
+            '{"a":3}',
+        ),
     ]
 
     # fetchall
@@ -204,21 +236,64 @@ def _(context):
 
 @then("Stream load and Select should be equal")
 def _(context):
-    values = [
-        [-1, 1, 1.0, "'", None, "2011-03-06", "2011-03-06T06:20:00Z"],
-        (-2, "2", 2.0, '"', "", "2012-05-31", "2012-05-31T11:20:00Z"),
-        ["-3", 3, 3.0, "\\", "NULL", "2016-04-04", "2016-04-04T11:30:00Z"],
-    ]
+    # Skip dictionary parameters for old driver versions that don't support them
+    values = []
+    if DRIVER_VERSION <= (0, 30, 3):
+        print("SKIP")
+        return
+    else:
+        # For new versions, use actual dict objects
+        values = [
+            [-1, 1, 1.0, "'", None, "2011-03-06", "2011-03-06T06:20:00Z", {"a": 1}],
+            (-2, "2", 2.0, '"', "", "2012-05-31", "2012-05-31T11:20:00Z", {"a": 2}),
+            [
+                "-3",
+                3,
+                3.0,
+                "\\",
+                "NULL",
+                "2016-04-04",
+                "2016-04-04T11:30:00Z",
+                {"a": 3},
+            ],
+        ]
     count = context.cursor.executemany("INSERT INTO test VALUES", values)
     assert count == 3, f"count: {count}"
 
     context.cursor.execute("SELECT * FROM test")
     rows = context.cursor.fetchall()
     ret = [row.values() for row in rows]
     expected = [
-        (-1, 1, 1.0, "'", None, date(2011, 3, 6), datetime(2011, 3, 6, 6, 20)),
-        (-2, 2, 2.0, '"', None, date(2012, 5, 31), datetime(2012, 5, 31, 11, 20)),
-        (-3, 3, 3.0, "\\", "NULL", date(2016, 4, 4), datetime(2016, 4, 4, 11, 30)),
+        (
+            -1,
+            1,
+            1.0,
+            "'",
+            None,
+            date(2011, 3, 6),
+            datetime(2011, 3, 6, 6, 20),
+            '{"a":1}',
+        ),
+        (
+            -2,
+            2,
+            2.0,
+            '"',
+            None,
+            date(2012, 5, 31),
+            datetime(2012, 5, 31, 11, 20),
+            '{"a":2}',
+        ),
+        (
+            -3,
+            3,
+            3.0,
+            "\\",
+            "NULL",
+            date(2016, 4, 4),
+            datetime(2016, 4, 4, 11, 30),
+            '{"a":3}',
+        ),
     ]
     assert ret == expected, f"ret: {ret}"
 
