BUG26029811: Improve error thrown when using an invalid parameter in bind()

nmariz · nmariz · commit 648277030e69 · 2017-06-01T15:36:34.000+01:00
The X DevAPI does not support binding anonymous parameters, but it
is possible to pass a single parameter to the bind() function in
Connector/Python. This parameter must be a JSON string or a DbDoc
object.

This patch improves the error thrown when the user is using a
parameter that is not a JSON string or DdDoc.

A test case was added for regression.
diff --git a/lib/mysqlx/statement.py b/lib/mysqlx/statement.py
@@ -260,13 +260,20 @@ def bind(self, *args):
             self._bindings.append({"name": args[0], "value": args[1]})
         return self
 
-    def _bind_single(self, object):
-        if isinstance(object, DbDoc):
-            self.bind(str(object))
-        elif isinstance(object, STRING_TYPES):
-            dict = json.loads(object)
-            for key in dict.keys():
-                self.bind(key, dict[key])
+    def _bind_single(self, obj):
+        if isinstance(obj, DbDoc):
+            self.bind(str(obj))
+        elif isinstance(obj, STRING_TYPES):
+            try:
+                res = json.loads(obj)
+                if not isinstance(res, dict):
+                    raise ValueError
+            except ValueError:
+                raise ProgrammingError("Invalid JSON string to bind")
+            for key in res.keys():
+                self.bind(key, res[key])
+        else:
+            raise ProgrammingError("Invalid JSON string or object to bind")
 
     def execute(self):
         """Execute the statement.
diff --git a/tests/test_mysqlx_crud.py b/tests/test_mysqlx_crud.py
@@ -1030,6 +1030,11 @@ def test_parameter_binding(self):
         self.assertEqual(1, len(docs))
         self.assertEqual("Wilma", docs[0]["name"])
 
+        # Binding anonymous parameters are not allowed in crud operations
+        self.assertRaises(mysqlx.ProgrammingError,
+                          collection.find("$.age = ?").bind, 42)
+        self.assertRaises(mysqlx.ProgrammingError,
+                          collection.find("$.name = ?").bind, "Fred")
         self.schema.drop_collection(collection_name)
 
     def test_unicode_parameter_binding(self):
