Add type compat for 4.0 and update CrateDB used in tests to 4.0.2

Author: mfussenegger

CHANGES.txt

@@ -5,6 +5,9 @@ Changes for crate
 Unreleased
 ==========
 
+- Extended the type mapping for SQLAlchemy for the upcoming type name changes
+  in CrateDB 4.0.
+
 - Added support for Python 3.7 and made that version the recommended one.
 
 2019/03/05 0.23.0

azure-pipelines.yml

@@ -36,5 +36,5 @@ jobs:
 
       - script: |
           bin/flake8
-          bin/coverage run bin/test -vv1
+          JAVA_HOME=$JAVA_HOME_12_X64 bin/coverage run bin/test -vv1
         displayName: 'test'

src/crate/client/doctests/client.txt

@@ -178,29 +178,31 @@ supported, all other fields are 'None'::
     >>> cursor.execute("SELECT * FROM locations order by name")
     >>> result = cursor.fetchone()
     >>> pprint(result)
-    [1373932800000,
+    ['Aldebaran',
+     1373932800000,
      None,
-     u'Max Quordlepleen claims that the only thing left ...',
      None,
      None,
-     u'Star System',
-     u'Aldebaran',
+     'Star System',
      None,
-     None,
-     1]
+     1,
+     'Max Quordlepleen claims that the only thing left after the end of the '
+     'Universe will be the sweets trolley and a fine selection of Aldebaran '
+     'liqueurs.',
+     None]
 
     >>> result = cursor.description
     >>> pprint(result)
-    ((u'date', None, None, None, None, None, None),
-     (u'datetime', None, None, None, None, None, None),
-     (u'description', None, None, None, None, None, None),
-     (u'details', None, None, None, None, None, None),
-     (u'flag', None, None, None, None, None, None),
-     (u'kind', None, None, None, None, None, None),
-     (u'name', None, None, None, None, None, None),
-     (u'nullable_date', None, None, None, None, None, None),
-     (u'nullable_datetime', None, None, None, None, None, None),
-     (u'position', None, None, None, None, None, None))
+    (('name', None, None, None, None, None, None),
+     ('date', None, None, None, None, None, None),
+     ('datetime', None, None, None, None, None, None),
+     ('nullable_datetime', None, None, None, None, None, None),
+     ('nullable_date', None, None, None, None, None, None),
+     ('kind', None, None, None, None, None, None),
+     ('flag', None, None, None, None, None, None),
+     ('position', None, None, None, None, None, None),
+     ('description', None, None, None, None, None, None),
+     ('details', None, None, None, None, None, None))
 
 Closing the Cursor
 ==================

src/crate/client/doctests/sqlalchemy.txt

@@ -308,9 +308,9 @@ In order to create all missing tables the ``create_all`` method can be used::
     ...         "where table_name = 'departments' "
     ...         "order by column_name")
     >>> pprint([str(r) for r in conn.execute(stmt)])
-    ["('departments', 'code', 1, 'integer')",
-     "('departments', 'id', 2, 'string')",
-     "('departments', 'name', 3, 'string')"]
+    ["('departments', 'code', 3, 'integer')",
+     "('departments', 'id', 1, 'text')",
+     "('departments', 'name', 2, 'text')"]
 
 Delete Tables
 -------------

src/crate/client/sqlalchemy/dialect.py

@@ -39,26 +39,38 @@
 TYPES_MAP = {
     "boolean": sqltypes.Boolean,
     "short": sqltypes.SmallInteger,
+    "smallint": sqltypes.SmallInteger,
     "timestamp": sqltypes.TIMESTAMP,
+    "timestamp with time zone": sqltypes.TIMESTAMP,
     "object": Object,
     "integer": sqltypes.Integer,
     "long": sqltypes.NUMERIC,
+    "bigint": sqltypes.NUMERIC,
     "double": sqltypes.DECIMAL,
+    "double precision": sqltypes.DECIMAL,
     "object_array": ObjectArray,
     "float": sqltypes.Float,
-    "string": sqltypes.String
+    "real": sqltypes.Float,
+    "string": sqltypes.String,
+    "text": sqltypes.String
 }
 try:
     # SQLAlchemy >= 1.1
     from sqlalchemy.types import ARRAY
     TYPES_MAP["integer_array"] = ARRAY(sqltypes.Integer)
     TYPES_MAP["boolean_array"] = ARRAY(sqltypes.Boolean)
     TYPES_MAP["short_array"] = ARRAY(sqltypes.SmallInteger)
+    TYPES_MAP["smallint_array"] = ARRAY(sqltypes.SmallInteger)
     TYPES_MAP["timestamp_array"] = ARRAY(sqltypes.TIMESTAMP)
+    TYPES_MAP["timestamp with time zone_array"] = ARRAY(sqltypes.TIMESTAMP)
     TYPES_MAP["long_array"] = ARRAY(sqltypes.NUMERIC)
+    TYPES_MAP["bigint_array"] = ARRAY(sqltypes.NUMERIC)
     TYPES_MAP["double_array"] = ARRAY(sqltypes.DECIMAL)
+    TYPES_MAP["double precision_array"] = ARRAY(sqltypes.DECIMAL)
     TYPES_MAP["float_array"] = ARRAY(sqltypes.Float)
+    TYPES_MAP["real_array"] = ARRAY(sqltypes.Float)
     TYPES_MAP["string_array"] = ARRAY(sqltypes.String)
+    TYPES_MAP["text_array"] = ARRAY(sqltypes.String)
 except Exception:
     pass
 

src/crate/client/tests.py

@@ -99,7 +99,6 @@ def setUpMocked(test):
 
 settings = {
     'udc.enabled': 'false',
-    'license.enterprise': 'true',
     'lang.js.enabled': 'true',
     'auth.host_based.enabled': 'true',
     'auth.host_based.config.0.user': 'crate',

src/crate/testing/layer.py

@@ -222,6 +222,7 @@ def __init__(self,
         self.verbose = verbose
         self.env = env or {}
         self.env.setdefault('CRATE_USE_IPV4', 'true')
+        self.env.setdefault('JAVA_HOME', os.environ.get('JAVA_HOME'))
         self._stdout_consumers = []
         self.conn_pool = urllib3.PoolManager(num_pools=1)
 

versions.cfg

@@ -1,5 +1,5 @@
 [versions]
-crate_server = 3.2.5
+crate_server = 4.0.2
 
 flake8 = 2.5.1
 mccabe = 0.3.1