Sqla 1.14 update

CHANGELOG.md

@@ -5,6 +5,11 @@
 * In the next minor release (0.3.0) the row_binary option for ClickHouse serialization will be removed.  The performance is significantly lower than Native format and maintaining the option adds complexity with no corresponding benefit
 
 
+### Release 0.2.6 2022-09-08
+
+#### Bug Fix
+* Fixed an SQLAlchemy dialect issue with SQLAlchemy 1.4 that would cause problems in the most recent Superset version
+
 ### Release 0.2.5 2022-08-30
 
 #### Bug Fix

clickhouse_connect/cc_sqlalchemy/dialect.py

@@ -82,8 +82,9 @@ def get_check_constraints(self, connection, table_name, schema=None, **kw):
         return []
 
     def has_table(self, connection, table_name, schema=None):
-        row = connection.execute(f'EXISTS TABLE {full_table(table_name, schema)}').next()
-        return row.result == 1
+        result = connection.execute(f'EXISTS TABLE {full_table(table_name, schema)}')
+        row = result.fetchone()
+        return row[0] == 1
 
     def has_sequence(self, connection, sequence_name, schema=None):
         return False

clickhouse_connect/driver/client.py

@@ -340,12 +340,17 @@ def min_version(self, version_str: str) -> bool:
         """
         Determine whether the connected server is at least the submitted version
         :param version_str:  Version string consisting of up to 4 integers delimited by dots
-        :return:  1 if the version_str is greater than the server_version, 0 if equal, -1 if less than
+        :return:  True version_str is greater than the server_version, False if less than
         """
-        server_parts = [int(x) for x in self.server_version.split('.')]
-        server_parts.extend([0] * (4 - len(server_parts)))
-        version_parts = [int(x) for x in version_str.split('.')]
-        version_parts.extend([0] * (4 - len(version_parts)))
+        try:
+            server_parts = [int(x) for x in self.server_version.split('.')]
+            server_parts.extend([0] * (4 - len(server_parts)))
+            version_parts = [int(x) for x in version_str.split('.')]
+            version_parts.extend([0] * (4 - len(version_parts)))
+        except ValueError:
+            logger.warning('Server %s or requested version %s does not match format of numbers separated by dots',
+                           self.server_version, version_str)
+            return False
         for x, y in zip(server_parts, version_parts):
             if x > y:
                 return True

tests/test_requirements.txt

@@ -1,10 +1,12 @@
 requests
 pytz
-werkzeug==2.0.3
 sqlalchemy>1.3.21,<1.4
-apache_superset>=1.4.1
+apache_superset>=2.0.0
+flask==2.0.3
 MarkupSafe==2.0.1
 Jinja2==3.0.3
+werkzeug==2.0.3
+WTForms==2.3.3
 cython
 pytest
 pytest-mock