sqlalchemy-cratedb 0.38.0__py3-none-any.whl → 0.38.0.dev0__py3-none-any.whl

sqlalchemy_cratedb/compiler.py

@@ -100,13 +100,13 @@ def crate_before_execute(conn, clauseelement, multiparams, params, *args, **kwar
 class CrateDDLCompiler(compiler.DDLCompiler):
 
     __special_opts_tmpl = {
-        'partitioned_by': ' PARTITIONED BY ({0})'
+        'PARTITIONED_BY': ' PARTITIONED BY ({0})'
     }
     __clustered_opts_tmpl = {
-        'number_of_shards': ' INTO {0} SHARDS',
-        'clustered_by': ' BY ({0})',
+        'NUMBER_OF_SHARDS': ' INTO {0} SHARDS',
+        'CLUSTERED_BY': ' BY ({0})',
     }
-    __clustered_opt_tmpl = ' CLUSTERED{clustered_by}{number_of_shards}'
+    __clustered_opt_tmpl = ' CLUSTERED{CLUSTERED_BY}{NUMBER_OF_SHARDS}'
 
     def get_column_specification(self, column, **kwargs):
         colspec = self.preparer.format_column(column) + " " + \
@@ -162,7 +162,7 @@ class CrateDDLCompiler(compiler.DDLCompiler):
         table_opts = []
 
         opts = dict(
-            (k[len(self.dialect.name) + 1:], v)
+            (k[len(self.dialect.name) + 1:].upper(), v)
             for k, v, in table.kwargs.items()
             if k.startswith('%s_' % self.dialect.name)
         )
@@ -225,7 +225,7 @@ class CrateTypeCompiler(compiler.GenericTypeCompiler):
         return 'SHORT'
 
     def visit_datetime(self, type_, **kw):
-        return self.visit_TIMESTAMP(type_, **kw)
+        return 'TIMESTAMP'
 
     def visit_date(self, type_, **kw):
         return 'TIMESTAMP'
@@ -245,16 +245,6 @@ class CrateTypeCompiler(compiler.GenericTypeCompiler):
             raise ValueError("FloatVector must be initialized with dimension size")
         return f"FLOAT_VECTOR({dimensions})"
 
-    def visit_TIMESTAMP(self, type_, **kw):
-        """
-        Support for `TIMESTAMP WITH|WITHOUT TIME ZONE`.
-
-        From `sqlalchemy.dialects.postgresql.base.PGTypeCompiler`.
-        """
-        return "TIMESTAMP %s" % (
-            (type_.timezone and "WITH" or "WITHOUT") + " TIME ZONE",
-        )
-
 
 class CrateCompiler(compiler.SQLCompiler):
 

sqlalchemy_cratedb/dialect.py

@@ -32,6 +32,7 @@ from .compiler import (
     CrateDDLCompiler,
     CrateIdentifierPreparer,
 )
+from crate.client.exceptions import TimezoneUnawareException
 from .sa_version import SA_VERSION, SA_1_4, SA_2_0
 from .type import FloatVector, ObjectArray, ObjectType
 
@@ -39,8 +40,8 @@ TYPES_MAP = {
     "boolean": sqltypes.Boolean,
     "short": sqltypes.SmallInteger,
     "smallint": sqltypes.SmallInteger,
-    "timestamp": sqltypes.TIMESTAMP(timezone=False),
-    "timestamp with time zone": sqltypes.TIMESTAMP(timezone=True),
+    "timestamp": sqltypes.TIMESTAMP,
+    "timestamp with time zone": sqltypes.TIMESTAMP,
     "object": ObjectType,
     "integer": sqltypes.Integer,
     "long": sqltypes.NUMERIC,
@@ -61,8 +62,8 @@ try:
     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(timezone=False))
-    TYPES_MAP["timestamp with time zone_array"] = ARRAY(sqltypes.TIMESTAMP(timezone=True))
+    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)
@@ -113,10 +114,15 @@ class Date(sqltypes.Date):
 
 class DateTime(sqltypes.DateTime):
 
+    TZ_ERROR_MSG = "Timezone aware datetime objects are not supported"
+
     def bind_processor(self, dialect):
         def process(value):
-            if isinstance(value, (datetime, date)):
-                return value.strftime('%Y-%m-%dT%H:%M:%S.%f%z')
+            if value is not None:
+                assert isinstance(value, datetime)
+                if value.tzinfo is not None:
+                    raise TimezoneUnawareException(DateTime.TZ_ERROR_MSG)
+                return value.strftime('%Y-%m-%dT%H:%M:%S.%fZ')
             return value
         return process
 
@@ -146,9 +152,8 @@ class DateTime(sqltypes.DateTime):
 
 
 colspecs = {
-    sqltypes.Date: Date,
     sqltypes.DateTime: DateTime,
-    sqltypes.TIMESTAMP: DateTime,
+    sqltypes.Date: Date
 }
 
 

sqlalchemy_cratedb/support/polyfill.py

@@ -108,7 +108,10 @@ def refresh_after_dml_engine(engine: sa.engine.Engine):
     ):
         if isinstance(clauseelement, (sa.sql.Insert, sa.sql.Update, sa.sql.Delete)):
             if not isinstance(clauseelement.table, sa.sql.Join):
-                refresh_table(conn, clauseelement.table)
+                full_table_name = f'"{clauseelement.table.name}"'
+                if clauseelement.table.schema is not None:
+                    full_table_name = f'"{clauseelement.table.schema}".' + full_table_name
+                refresh_table(conn, full_table_name)
 
     sa.event.listen(engine, "after_execute", receive_after_execute)
 

sqlalchemy_cratedb/support/util.py

@@ -10,21 +10,14 @@ if t.TYPE_CHECKING:
         pass
 
 
-def refresh_table(connection, target: t.Union[str, "DeclarativeBase", "sa.sql.selectable.TableClause"]):
+def refresh_table(connection, target: t.Union[str, "DeclarativeBase"]):
     """
     Invoke a `REFRESH TABLE` statement.
     """
-
-    if isinstance(target, sa.sql.selectable.TableClause):
-        full_table_name = f'"{target.name}"'
-        if target.schema is not None:
-            full_table_name = f'"{target.schema}".' + full_table_name
-    elif hasattr(target, "__tablename__"):
-        full_table_name = target.__tablename__
+    if hasattr(target, "__tablename__"):
+        sql = f"REFRESH TABLE {target.__tablename__}"
     else:
-        full_table_name = target
-
-    sql = f"REFRESH TABLE {full_table_name}"
+        sql = f"REFRESH TABLE {target}"
     connection.execute(sa.text(sql))
 
 

{sqlalchemy_cratedb-0.38.0.dist-info → sqlalchemy_cratedb-0.38.0.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-cratedb
-Version: 0.38.0
+Version: 0.38.0.dev0
 Summary: SQLAlchemy dialect for CrateDB.
 Author-email: "Crate.io" <office@crate.io>
 License: Apache License 2.0

{sqlalchemy_cratedb-0.38.0.dist-info → sqlalchemy_cratedb-0.38.0.dev0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 sqlalchemy_cratedb/__init__.py,sha256=HIsl7K75Yi2Z1rey-LXPiuonRVJ-Qj8TVWKmIk5d8g8,2289
-sqlalchemy_cratedb/compiler.py,sha256=dfD5qRHQfs0XseJvUxkGNpgqvtTNPkYlwOC7L2sEkqI,13294
-sqlalchemy_cratedb/dialect.py,sha256=k6CHSnYqL53ShhCVVlZSOgSY2Y3xGtQxTl2Ip04xYQE,14101
+sqlalchemy_cratedb/compiler.py,sha256=ECzlBzegW8Ib1dq-bGKfhZxx7yfQCSj7wi9ozENRd7Y,12974
+sqlalchemy_cratedb/dialect.py,sha256=LTV4dicnHOdriKifZtnmXivl1RMFmqgj2A0E6uiX8jg,14288
 sqlalchemy_cratedb/predicate.py,sha256=HT7tHF7PxX71G8m91lqpH732iVQZtO8_NPZUIsllcys,3622
 sqlalchemy_cratedb/sa_version.py,sha256=NhNA5FUw0Sm5n-fSVo6CTcaioDRovUknFOslX31ir-I,1168
 sqlalchemy_cratedb/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,17 +10,17 @@ sqlalchemy_cratedb/compat/core14.py,sha256=xh_wnNkMUD8aE_VFQPnPeXWsPIFzPg0ZjkhfJ
 sqlalchemy_cratedb/compat/core20.py,sha256=QgNEA4z37ldFI4X9HapbTcga7KvsrdMkoMRjxvCJ4tE,15145
 sqlalchemy_cratedb/support/__init__.py,sha256=AwqsVVRBaoMaTZ0zNjcoY9HbLIQsP1vlu__ANL___vY,450
 sqlalchemy_cratedb/support/pandas.py,sha256=bEQTPJBvJepM5_GY5Jxewu26Fs6d8AKzizxgO4vw2PA,4357
-sqlalchemy_cratedb/support/polyfill.py,sha256=0w6zHpptLot68xrHLa67Bbe4pM-kPczyp3qDpkQqWhU,4931
-sqlalchemy_cratedb/support/util.py,sha256=L-DFQv8dg8onTs1ahGBqefd9WzRCZNWGBvP3DJHyqDo,1265
+sqlalchemy_cratedb/support/polyfill.py,sha256=cGAVWkl1DisSuGamvee_Qxjvp_ss9uJGq_mM8nUh0lI,5143
+sqlalchemy_cratedb/support/util.py,sha256=Ll4ZNZBqtApRkzbTFLxT6MoAfWFBIlXBCZEnyyHLxto,986
 sqlalchemy_cratedb/type/__init__.py,sha256=8Bp0RKTFAx-3ETOcG4R4wjhL5rarN7tJLfrue7S6mH8,141
 sqlalchemy_cratedb/type/array.py,sha256=RrHkFoNmTKtk_6md0OtsR7xofRxdk0PbfO-JFfevBJI,4396
 sqlalchemy_cratedb/type/geo.py,sha256=9wFGxGMxxN-7_qZTlmWialzaPp_zzFj4U-yVqY_deA0,1377
 sqlalchemy_cratedb/type/object.py,sha256=-bebiW38vor3grD9qsomzJ_z3zRpNMb2XLLto2fFez4,3016
 sqlalchemy_cratedb/type/vector.py,sha256=5Q2v-RuiNKriSm-EX7tTb1PelqqoBvjDOFDB27Xxk5I,4723
-sqlalchemy_cratedb-0.38.0.dist-info/LICENSE,sha256=s_w3FXmAYQuatqsgvyYLnGyC_13KOqp3W1DUEXO9RpY,10175
-sqlalchemy_cratedb-0.38.0.dist-info/METADATA,sha256=M2KXvL3JlsBRSXsB4Twmjkte9ml9X3ivtWJdhosCaf4,6585
-sqlalchemy_cratedb-0.38.0.dist-info/NOTICE,sha256=yU9CWOf_XrVU7fpqGgM9tDjppoMyfHHBmFVMiINZk-k,1167
-sqlalchemy_cratedb-0.38.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-sqlalchemy_cratedb-0.38.0.dist-info/entry_points.txt,sha256=c14wyCG3OeM64_DUbI_vLVUXR3e3GhDyO_PCjo6UQMU,57
-sqlalchemy_cratedb-0.38.0.dist-info/top_level.txt,sha256=UjjXz0burl_-2MApzLzffHG_2RXm6KljZvoGJHISMPo,19
-sqlalchemy_cratedb-0.38.0.dist-info/RECORD,,
+sqlalchemy_cratedb-0.38.0.dev0.dist-info/LICENSE,sha256=s_w3FXmAYQuatqsgvyYLnGyC_13KOqp3W1DUEXO9RpY,10175
+sqlalchemy_cratedb-0.38.0.dev0.dist-info/METADATA,sha256=trBbdmkXNPx969gGqt2JwR57kzZnwLqbJoWLi0g8eyE,6590
+sqlalchemy_cratedb-0.38.0.dev0.dist-info/NOTICE,sha256=yU9CWOf_XrVU7fpqGgM9tDjppoMyfHHBmFVMiINZk-k,1167
+sqlalchemy_cratedb-0.38.0.dev0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sqlalchemy_cratedb-0.38.0.dev0.dist-info/entry_points.txt,sha256=c14wyCG3OeM64_DUbI_vLVUXR3e3GhDyO_PCjo6UQMU,57
+sqlalchemy_cratedb-0.38.0.dev0.dist-info/top_level.txt,sha256=UjjXz0burl_-2MApzLzffHG_2RXm6KljZvoGJHISMPo,19
+sqlalchemy_cratedb-0.38.0.dev0.dist-info/RECORD,,

{sqlalchemy_cratedb-0.38.0.dist-info → sqlalchemy_cratedb-0.38.0.dev0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any