SA14: Adjust CrateDB dialect compiler patch to SqlAlchemy 1.4.36

The original code for `visit_update` and `_get_crud_params` from
SQLAlchemy 1.4.0b1 has been vendored into the CrateDB dialect the other day,
in order to amend it due to dialect-specific purposes.

This patch reflects the changes from SA 1.4.0b1 to SA 1.4.36 on this code.

Author: amotl

src/crate/client/sqlalchemy/compiler.py

@@ -23,11 +23,13 @@
 from collections import defaultdict
 
 import sqlalchemy as sa
-from sqlalchemy.sql import crud, selectable
-from sqlalchemy.sql import compiler
 from .types import MutableDict
 from .sa_version import SA_VERSION, SA_1_1, SA_1_4
 
+crud = sa.sql.crud
+selectable = sa.sql.selectable
+compiler = sa.sql.compiler
+
 
 INSERT_SELECT_WITHOUT_PARENTHESES_MIN_VERSION = (1, 0, 1)
 
@@ -521,6 +523,10 @@ def visit_update_14(self, update_stmt, **kw):
         else:
             dialect_hints = None
 
+        if update_stmt._independent_ctes:
+            for cte in update_stmt._independent_ctes:
+                cte._compiler_dispatch(self, **kw)
+
         text += table_text
 
         text += " SET "
@@ -580,8 +586,9 @@ def visit_update_14(self, update_stmt, **kw):
                 update_stmt, self.returning or update_stmt._returning
             )
 
-        if self.ctes and toplevel:
-            text = self._render_cte_clause() + text
+        if self.ctes:
+            nesting_level = len(self.stack) if not toplevel else None
+            text = self._render_cte_clause(nesting_level=nesting_level) + text
 
         self.stack.pop(-1)
 
@@ -602,7 +609,7 @@ def _get_crud_params_14(compiler, stmt, compile_state, **kw):
     from sqlalchemy.sql.crud import _create_bind_param
     from sqlalchemy.sql.crud import REQUIRED
     from sqlalchemy.sql.crud import _get_stmt_parameter_tuples_params
-    from sqlalchemy.sql.crud import _get_multitable_params
+    from sqlalchemy.sql.crud import _get_update_multitable_params
     from sqlalchemy.sql.crud import _scan_insert_from_select_cols
     from sqlalchemy.sql.crud import _scan_cols
     from sqlalchemy import exc  # noqa: F401
@@ -682,7 +689,7 @@ def _get_crud_params_14(compiler, stmt, compile_state, **kw):
     # special logic that only occurs for multi-table UPDATE
     # statements
     if compile_state.isupdate and compile_state.is_multitable:
-        _get_multitable_params(
+        _get_update_multitable_params(
             compiler,
             stmt,
             compile_state,
@@ -738,9 +745,18 @@ def _get_crud_params_14(compiler, stmt, compile_state, **kw):
 
     if compile_state._has_multi_parameters:
         values = _extend_values_for_multiparams(
-            compiler, stmt, compile_state, values, kw
+            compiler,
+            stmt,
+            compile_state,
+            values,
+            _column_as_key,
+            kw,
         )
-    elif not values and compiler.for_executemany:
+    elif (
+        not values
+        and compiler.for_executemany  # noqa: W503
+        and compiler.dialect.supports_default_metavalue  # noqa: W503
+    ):
         # convert an "INSERT DEFAULT VALUES"
         # into INSERT (firstcol) VALUES (DEFAULT) which can be turned
         # into an in-place multi values.  This supports

src/crate/client/sqlalchemy/dialect.py

@@ -26,7 +26,7 @@
 # FIXME: Workaround to be able to use SQLAlchemy 1.4.
 #        Caveat: This purges the ``cresultproxy`` extension
 #        at runtime, so it will impose a speed bump.
-import crate.client.sqlalchemy.monkey  # noqa:F401
+import crate.client.sqlalchemy.monkey  # noqa:F401, lgtm [py/unused-import]
 
 from sqlalchemy import types as sqltypes
 from sqlalchemy.engine import default, reflection

src/crate/client/sqlalchemy/types.py

@@ -168,7 +168,7 @@ class Any(expression.ColumnElement):
 
     def __init__(self, left, right, operator=operators.eq):
         self.type = sqltypes.Boolean()
-        self.left = expression._literal_as_binds(left)
+        self.left = expression.literal(left)
         self.right = right
         self.operator = operator