Add support for SQLAlchemy 2.0

.github/workflows/codeql.yml

@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         language: [ python ]
-        sqla-version: ['1.3.24', '1.4.46']
+        sqla-version: ['1.3.24', '1.4.46', '2.0.0']
 
     steps:
       - name: Checkout

.github/workflows/tests.yml

@@ -22,7 +22,7 @@ jobs:
         os: ['ubuntu-latest', 'macos-latest']
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         cratedb-version: ['5.2.0']
-        sqla-version: ['1.3.24', '1.4.46']
+        sqla-version: ['1.3.24', '1.4.46', '2.0.0']
         # To save resources, only use the most recent Python version on macOS.
         exclude:
           - os: 'macos-latest'

CHANGES.txt

@@ -5,9 +5,11 @@ Changes for crate
 Unreleased
 ==========
 
-- Add deprecation warning about dropping support for SQLAlchemy 1.3 soon, it is
+- Added deprecation warning about dropping support for SQLAlchemy 1.3 soon, it is
   effectively EOL.
 
+- Added support for SQLAlchemy 2.0.
+
 
 2022/12/08 0.29.0
 =================

docs/by-example/sqlalchemy/crud.rst

@@ -130,7 +130,7 @@ Retrieve
 
 Using the connection to execute a select statement:
 
-    >>> result = connection.execute('select name from locations order by name')
+    >>> result = connection.execute(text('select name from locations order by name'))
     >>> result.rowcount
     14
 

setup.cfg

@@ -2,4 +2,4 @@
 universal = 1
 
 [flake8]
-ignore = E501, C901, W504
+ignore = E501, C901, W503, W504

setup.py

@@ -60,7 +60,7 @@ def read(path):
     },
     install_requires=['urllib3>=1.9,<3'],
     extras_require=dict(
-        sqlalchemy=['sqlalchemy>=1.0,<1.5',
+        sqlalchemy=['sqlalchemy>=1.0,<2.1',
                     'geojson>=2.5.0,<3',
                     'backports.zoneinfo<1; python_version<"3.9"'],
         test=['tox>=3,<4',

src/crate/client/sqlalchemy/compat/core10.py

@@ -20,6 +20,7 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql.base import PGCompiler
 from sqlalchemy.sql.crud import (REQUIRED, _create_bind_param,
                                  _extend_values_for_multiparams,
                                  _get_multitable_params,
@@ -32,6 +33,12 @@
 
 class CrateCompilerSA10(CrateCompiler):
 
+    def returning_clause(self, stmt, returning_cols):
+        """
+        Generate RETURNING clause, PostgreSQL-compatible.
+        """
+        return PGCompiler.returning_clause(self, stmt, returning_cols)
+
     def visit_update(self, update_stmt, **kw):
         """
         used to compile <sql.expression.Update> expressions

src/crate/client/sqlalchemy/compat/core14.py

@@ -20,6 +20,7 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql.base import PGCompiler
 from sqlalchemy.sql import selectable
 from sqlalchemy.sql.crud import (REQUIRED, _create_bind_param,
                                  _extend_values_for_multiparams,
@@ -33,6 +34,12 @@
 
 class CrateCompilerSA14(CrateCompiler):
 
+    def returning_clause(self, stmt, returning_cols):
+        """
+        Generate RETURNING clause, PostgreSQL-compatible.
+        """
+        return PGCompiler.returning_clause(self, stmt, returning_cols)
+
     def visit_update(self, update_stmt, **kw):
 
         compile_state = update_stmt._compile_state_factory(