fix optimization for bulk updates

- don't optimize if parameters are not supplied yet
- check the key type before binding parameters

Author: mxm

README.rst

@@ -76,7 +76,7 @@ Looking for more help?
 .. _contribution docs: CONTRIBUTING.rst
 .. _Crate.io: http://crate.io/
 .. _CrateDB: https://github.com/crate/crate
-.. _DB API 2.0: http://www.python.org/dev/peps/pep-0249/>
+.. _DB API 2.0: http://www.python.org/dev/peps/pep-0249/
 .. _developer docs: DEVELOP.rst
 .. _paid support: https://crate.io/pricing/
 .. _pip: https://pypi.python.org/pypi/pip

src/crate/client/sqlalchemy/compiler.py

@@ -44,9 +44,10 @@ def rewrite_update(clauseelement, multiparams, params):
     The update statement is only rewritten if an item of the MutableDict was
     changed.
     """
-
     newmultiparams = []
     _multiparams = multiparams[0]
+    if len(_multiparams) == 0:
+        return clauseelement, multiparams, params
     for _params in _multiparams:
         newparams = {}
         for key, val in _params.items():
@@ -316,7 +317,7 @@ def visit_update(self, update_stmt, **kw):
             set_clauses.append(clause)
 
         for k, v in update_stmt.parameters.items():
-            if '[' in k:
+            if type(k) is str and '[' in k:
                 bindparam = sa.sql.bindparam(k, v)
                 set_clauses.append(k + ' = ' + self.process(bindparam))
 

src/crate/client/sqlalchemy/tests/compiler_test.py

@@ -21,6 +21,7 @@
 
 from __future__ import absolute_import
 from unittest import TestCase
+
 from crate.client.sqlalchemy.compiler import crate_before_execute
 
 import sqlalchemy as sa
@@ -55,3 +56,17 @@ def test_crate_update_rewritten(self):
         )
 
         assert hasattr(clauseelement, '_crate_specific') is True
+
+
+    def test_bulk_update_on_builtin_type(self):
+        """
+        The "before_execute" hook in the compiler doesn't get
+        access to the parameters in case of a bulk update. It
+        should not try to optimize any parameters.
+        """
+        data = ({},)
+        clauseelement, multiparams, params = crate_before_execute(
+            self.crate_engine, self.update, data, None
+        )
+
+        assert hasattr(clauseelement, '_crate_specific') is False