Drop support for CrateDB < 1.0.0

Author: amotl

CHANGES.txt

@@ -8,6 +8,8 @@ Unreleased
 - Added official support for Python 3.9 and 3.10.
 - Dropped support for SQLAlchemy 1.1 and 1.2.
 
+- Dropped support for CrateDB < 1.0.0.
+
 
 - BREAKING CHANGE: The driver now verifies SSL certificates when connecting via
   HTTP by default. Previously, this setting defaulted to false. This setting

src/crate/client/cursor.py

@@ -20,11 +20,8 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 from .exceptions import ProgrammingError
-from distutils.version import StrictVersion
 import warnings
 
-BULK_INSERT_MIN_VERSION = StrictVersion("0.42.0")
-
 
 class Cursor(object):
     """
@@ -63,20 +60,14 @@ def executemany(self, sql, seq_of_parameters):
         """
         row_counts = []
         durations = []
-        if self.connection.lowest_server_version >= BULK_INSERT_MIN_VERSION:
-            self.execute(sql, bulk_parameters=seq_of_parameters)
-            for result in self._result.get('results', []):
-                if result.get('rowcount') > -1:
-                    row_counts.append(result.get('rowcount'))
-            if self.duration > -1:
-                durations.append(self.duration)
-        else:
-            for params in seq_of_parameters:
-                self.execute(sql, parameters=params)
-                if self.rowcount > -1:
-                    row_counts.append(self.rowcount)
-                if self.duration > -1:
-                    durations.append(self.duration)
+        self.execute(sql, bulk_parameters=seq_of_parameters)
+
+        for result in self._result.get('results', []):
+            if result.get('rowcount') > -1:
+                row_counts.append(result.get('rowcount'))
+        if self.duration > -1:
+            durations.append(self.duration)
+
         self._result = {
             "rowcount": sum(row_counts) if row_counts else -1,
             "duration": sum(durations) if durations else -1,

src/crate/client/doctests/connection.txt

@@ -10,7 +10,7 @@ We create a new connection object::
 
     >>> connection = connect(client=connection_client_mocked)
     >>> connection.lowest_server_version.version
-    (0, 42, 0)
+    (1, 42, 0)
 
 Calling the ``cursor()`` function on the connection will
 return a cursor object::

src/crate/client/doctests/cursor.txt

@@ -246,7 +246,7 @@ of parameters::
     123
 
 ``executemany()`` is not intended to be used with statements returning result
-sets. The result will alway be empty::
+sets. The result will always be empty::
 
     >>> cursor.fetchall()
     []
@@ -263,26 +263,6 @@ For completeness' sake the cursor description is updated nonetheless::
     ...     "duration":123
     ... })
 
-.. Hidden: close connection
-
-    >>> connection.close()
-
-Usually ``executemany`` sends the ``bulk_args`` parameter to the crate sql 
-endpoint which was introduced with Crate 0.42.0.
-If the client is connected to at least one crate server with an older version
-the client executes the statement once for every parameter within the sequence.
-
-The resulting ``rowcount`` and ``duration`` are the sum of all calls made to
-the server during this method execution.::
-
-    >>> connection_client_mocked.set_next_server_infos("local:4200", "my crate", "0.41.9")
-    >>> connection = connect(client=connection_client_mocked)
-    >>> cursor = connection.cursor()
-    >>> cursor.executemany('', (1,2,3))
-    >>> cursor.rowcount
-    9
-    >>> cursor.duration
-    369
 
 close()
 =======

src/crate/client/sqlalchemy/dialect.py

@@ -35,7 +35,6 @@
 from crate.client.exceptions import TimezoneUnawareException
 from .types import Object, ObjectArray
 
-SCHEMA_MIN_VERSION = (0, 57, 0)
 TABLE_TYPE_MIN_VERSION = (2, 0, 0)
 
 TYPES_MAP = {
@@ -298,9 +297,7 @@ def get_indexes(self, connection, table_name, schema, **kw):
 
     @property
     def schema_column(self):
-        return "table_schema" \
-            if self.server_version_info >= SCHEMA_MIN_VERSION \
-            else "schema_name"
+        return "table_schema"
 
     def _create_column_info(self, row):
         return {

src/crate/client/sqlalchemy/doctests/dialect.txt

@@ -9,7 +9,7 @@ The initialize method sets the default schema name and version info::
     >>> dialect.initialize(connection)
 
 
-    >>> dialect.server_version_info >= (0, 54, 6)
+    >>> dialect.server_version_info >= (1, 0, 0)
     True
 
 Check if table exists::

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

@@ -67,22 +67,7 @@ class Character(self.base):
         self.character = Character
         self.session = Session()
 
-    def test_pks_are_retrieved_depending_on_version_set_old(self):
-        meta = self.character.metadata
-        insp = inspect(meta.bind)
-        self.engine.dialect.server_version_info = (0, 54, 0)
-
-        self.fake_cursor.rowcount = 1
-        self.fake_cursor.description = (
-            ('foo', None, None, None, None, None, None),
-        )
-        self.fake_cursor.fetchone = MagicMock(return_value=[["id", "id2", "id3"]])
-
-        eq_(insp.get_pk_constraint("characters")['constrained_columns'], {"id", "id2", "id3"})
-        self.fake_cursor.fetchone.assert_called_once_with()
-        in_("information_schema.table_constraints", self.executed_statement)
-
-    def test_pks_are_retrieved_depending_on_version_set_new(self):
+    def test_primary_keys(self):
         meta = self.character.metadata
         insp = inspect(meta.bind)
         self.engine.dialect.server_version_info = (2, 3, 0)
@@ -116,9 +101,3 @@ def test_get_table_names(self):
         eq_(insp.get_table_names(self.connection, "doc"),
             ['t1', 't2'])
         in_("WHERE table_schema = ? ORDER BY", self.executed_statement)
-
-        insp = inspect(self.character.metadata.bind)
-        self.engine.dialect.server_version_info = (0, 56, 0)
-        eq_(insp.get_table_names(self.connection, "doc"),
-            ['t1', 't2'])
-        in_("WHERE schema_name = ? ORDER BY", self.executed_statement)

src/crate/client/tests.py

@@ -75,7 +75,7 @@ class ClientMocked(object):
 
     def __init__(self):
         self.response = {}
-        self._server_infos = ("http://localhost:4200", "my server", "0.42.0")
+        self._server_infos = ("http://localhost:4200", "my server", "1.42.0")
 
     def sql(self, stmt=None, parameters=None, bulk_parameters=None):
         return self.response