sqlalchemy-cratedb 0.38.0__tar.gz → 0.38.0.dev0__tar.gz

{sqlalchemy_cratedb-0.38.0 → sqlalchemy_cratedb-0.38.0.dev0}/CHANGES.md

@@ -2,8 +2,6 @@
 
 
 ## Unreleased
-
-## 2024/06/25 0.38.0
 - Added/reactivated documentation as `sqlalchemy-cratedb`
 - Added `CrateIdentifierPreparer`, in order to quote reserved words
   like `object` properly, for example when used as column names.
@@ -13,10 +11,6 @@
   `check_uniqueness_factory`
 - Added `table_kwargs` context manager to enable pandas/Dask to support
   CrateDB dialect table options.
-- Fixed SQL rendering of special DDL table options in `CrateDDLCompiler`.
-  Before, configuring `crate_"translog.durability"` was not possible.
-- Unlocked supporting timezone-aware `DateTime` fields
-- Added support for marshalling Python `datetime.date` values on `sa.DateTime` fields
 
 ## 2024/06/13 0.37.0
 - Added support for CrateDB's [FLOAT_VECTOR] data type and its accompanying

{sqlalchemy_cratedb-0.38.0/src/sqlalchemy_cratedb.egg-info → sqlalchemy_cratedb-0.38.0.dev0}/PKG-INFO

@@ -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 → sqlalchemy_cratedb-0.38.0.dev0}/pyproject.toml

@@ -80,9 +80,10 @@ classifiers = [
   "Topic :: Text Processing",
   "Topic :: Utilities",
 ]
-dynamic = [
-  "version",
-]
+#dynamic = [
+#  "version",
+#]
+version = "0.38.0.dev0"
 dependencies = [
   'backports.zoneinfo<1; python_version < "3.9"',
   "crate==1.0.0dev0",
@@ -277,7 +278,7 @@ lint = [
 
 release = [
   { cmd = "python -m build" },
-  { cmd = "twine upload --skip-existing dist/*" },
+  { cmd = "twine upload dist/*" },
 ]
 
 test = [

{sqlalchemy_cratedb-0.38.0 → sqlalchemy_cratedb-0.38.0.dev0}/src/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-0.38.0 → sqlalchemy_cratedb-0.38.0.dev0}/src/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-0.38.0 → sqlalchemy_cratedb-0.38.0.dev0}/src/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-0.38.0 → sqlalchemy_cratedb-0.38.0.dev0}/src/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 → sqlalchemy_cratedb-0.38.0.dev0/src/sqlalchemy_cratedb.egg-info}/PKG-INFO

@@ -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 → sqlalchemy_cratedb-0.38.0.dev0}/tests/test_support_pandas.py

@@ -2,7 +2,9 @@ import re
 import sys
 
 import pytest
+import sqlalchemy as sa
 from sqlalchemy.exc import ProgrammingError
+from sqlalchemy.orm import sessionmaker
 
 from pueblo.testing.pandas import makeTimeDataFrame
 
@@ -25,6 +27,7 @@ def test_table_kwargs_partitioned_by(cratedb_service):
     """
 
     engine = cratedb_service.database.engine
+    session = sessionmaker(bind=engine)()
 
     # Insert records from pandas dataframe.
     with table_kwargs(crate_partitioned_by="time"):
@@ -39,7 +42,10 @@ def test_table_kwargs_partitioned_by(cratedb_service):
     cratedb_service.database.refresh_table(TABLE_NAME)
 
     # Inquire table cardinality.
-    count = cratedb_service.database.count_records(TABLE_NAME)
+    metadata = sa.MetaData()
+    query = sa.select(sa.func.count()).select_from(sa.Table(TABLE_NAME, metadata))
+    results = session.execute(query)
+    count = results.scalar()
 
     # Compare outcome.
     assert count == INSERT_RECORDS
@@ -49,38 +55,6 @@ def test_table_kwargs_partitioned_by(cratedb_service):
     assert 'PARTITIONED BY ("time")' in ddl[0][0]
 
 
-@pytest.mark.skipif(sys.version_info < (3, 8), reason="Feature not supported on Python 3.7 and earlier")
-@pytest.mark.skipif(SA_VERSION < SA_2_0, reason="Feature not supported on SQLAlchemy 1.4 and earlier")
-def test_table_kwargs_translog_durability(cratedb_service):
-    """
-    Validate adding CrateDB dialect table option `translog.durability` at runtime.
-    """
-
-    engine = cratedb_service.database.engine
-
-    # Insert records from pandas dataframe.
-    with table_kwargs(**{'crate_"translog.durability"': "'async'"}):
-        df.to_sql(
-            TABLE_NAME,
-            engine,
-            if_exists="replace",
-            index=False,
-        )
-
-    # Synchronize writes.
-    cratedb_service.database.refresh_table(TABLE_NAME)
-
-    # Inquire table cardinality.
-    count = cratedb_service.database.count_records(TABLE_NAME)
-
-    # Compare outcome.
-    assert count == INSERT_RECORDS
-
-    # Validate SQL DDL.
-    ddl = cratedb_service.database.run_sql(f"SHOW CREATE TABLE {TABLE_NAME}")
-    assert """"translog.durability" = 'ASYNC'""" in ddl[0][0]
-
-
 @pytest.mark.skipif(sys.version_info < (3, 8), reason="Feature not supported on Python 3.7 and earlier")
 @pytest.mark.skipif(SA_VERSION < SA_2_0, reason="Feature not supported on SQLAlchemy 1.4 and earlier")
 def test_table_kwargs_unknown(cratedb_service):