sqlalchemy-cratedb 0.41.0.dev2__tar.gz → 0.42.0__tar.gz

{sqlalchemy_cratedb-0.41.0.dev2 → sqlalchemy_cratedb-0.42.0}/CHANGES.md

@@ -1,6 +1,17 @@
 # Changelog
 
-## Unreleased
+## 2026/05/28 0.42.0
+- Added support for SQL Alchemy 2.1
+- Added support for Python 3.14
+- Added canonical [PostgreSQL client parameter `sslmode`], implementing
+  `sslmode=require` to connect to SSL-enabled CrateDB instances without
+  verifying the host name. The previous `ssl=true` parameter is flagged
+  for deprecation, therefore `sslmode` takes precedence while both
+  options coexist.
+
+[PostgreSQL client parameter `sslmode`]: https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION
+
+## 2025/01/30 0.41.0
 - Dependencies: Updated to `crate-2.0.0`, which uses `orjson` for JSON marshalling
 
 ## 2024/11/04 0.40.1

sqlalchemy_cratedb-0.42.0/CLAUDE.md

@@ -0,0 +1,73 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+`sqlalchemy-cratedb` is a SQLAlchemy dialect for CrateDB, a distributed SQL database. It supports SQLAlchemy 1.3 through 2.1 (with ongoing 2.1 compatibility work on the current branch).
+
+## Development Setup
+
+```bash
+source bootstrap.sh   # Creates .venv with Python 3.11, installs all deps in editable mode
+```
+
+Environment variables that influence bootstrap:
+- `CRATEDB_VERSION` (default: `5.5.1`) — CrateDB Docker image version
+- `SQLALCHEMY_VERSION` (default: `<2.2`) — SQLAlchemy version constraint
+- `PIP_ALLOW_PRERELEASE=true` — allow pre-release packages
+
+## Common Commands
+
+```bash
+poe format    # Auto-format code (ruff + black)
+poe lint      # Run linters (ruff, validate-pyproject)
+poe test      # Run pytest + integration tests
+poe check     # lint + test combined
+
+# Run specific tests
+pytest tests/dict_test.py
+pytest -k SqlAlchemyCompilerTest
+pytest -k test_score
+
+# Run integration/doctests
+python -m unittest -vvv tests/integration.py
+```
+
+Tests require a live CrateDB instance via Docker (managed automatically by `cratedb_toolkit.testing.testcontainers`).
+
+## Architecture
+
+### Source layout (`src/sqlalchemy_cratedb/`)
+
+- **`dialect.py`** — Core dialect: type mappings, Date/DateTime handling, schema reflection
+- **`compiler.py`** — SQL/DDL compilation: `CrateDDLCompiler`, `CrateTypeCompiler`, `CrateIdentifierPreparer`, and `rewrite_update()` for partial object updates
+- **`predicate.py`** — `match()` predicate for full-text search
+- **`sa_version.py`** — Version detection; exports `SA_VERSION`, `SA_1_4`, `SA_2_0`, `SA_2_1` constants
+- **`compat/`** — Multi-version SQLAlchemy compatibility: `core10.py`, `core14.py`, `core20.py`, `core21.py`, `api13.py`
+- **`type/`** — Custom CrateDB types: `ObjectType` (JSON objects), `ObjectArray`, `FloatVector`, `Geopoint`, `Geoshape`
+- **`support/`** — Integrations and polyfills: `pandas.py` (bulk insert), `polyfill.py` (refresh-after-DML, uniqueness, autoincrement timestamps), `util.py`
+
+### Key architectural patterns
+
+**Multi-version compatibility:** The `compat/` directory contains separate modules for each major SQLAlchemy version. `sa_version.py` detects the installed version at runtime using `verlib2`, and code conditionally imports from the appropriate compat module. When adding features, check whether they need version-specific handling.
+
+**Custom types:** CrateDB types (ObjectType, FloatVector, etc.) implement SQLAlchemy's bind/result processor pattern — `bind_processor()` converts Python → SQL, `result_processor()` converts SQL → Python. The `CrateTypeCompiler` generates the SQL type strings.
+
+**Update rewriting:** `compiler.py::rewrite_update()` transforms partial dictionary updates on `ObjectType` columns into CrateDB's subscript assignment syntax (e.g., `obj['key'] = value`).
+
+**Polyfills:** `support/polyfill.py` monkey-patches SQLAlchemy internals to add features CrateDB doesn't natively support (e.g., `refresh_after_dml`, `uniqueness_strategy`).
+
+### Testing
+
+Tests in `tests/` follow two patterns:
+- `*_test.py` files: unit/integration tests using pytest with a live CrateDB instance
+- `tests/integration.py`: doctests for documentation examples, run with `unittest`
+
+The `conftest.py` provides a session-scoped `cratedb_service` fixture that starts CrateDB via Docker containers.
+
+## Code Style
+
+- Line length: 100 characters (ruff + black)
+- Ruff rules enforced: A, B, C4, E, ERA, F, I, PD, RET, S, T20, W, YTT
+- Mypy strict mode is configured but not always enforced in CI

{sqlalchemy_cratedb-0.41.0.dev2/src/sqlalchemy_cratedb.egg-info → sqlalchemy_cratedb-0.42.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: sqlalchemy-cratedb
-Version: 0.41.0.dev2
+Version: 0.42.0
 Summary: SQLAlchemy dialect for CrateDB.
 Author-email: "Crate.io" <office@crate.io>
 License: Apache License 2.0
@@ -34,6 +34,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Programming Language :: SQL
@@ -64,35 +65,37 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: backports.zoneinfo<1; python_version < "3.9"
-Requires-Dist: crate<3,>=2.0.0.dev6
+Requires-Dist: crate<3,>=2
 Requires-Dist: geojson<4,>=2.5
+Requires-Dist: importlib-metadata; python_version < "3.8"
 Requires-Dist: importlib-resources; python_version < "3.9"
-Requires-Dist: sqlalchemy<2.1,>=1
-Requires-Dist: verlib2==0.2
+Requires-Dist: sqlalchemy<2.2,>=1
+Requires-Dist: verlib2<0.4
 Provides-Extra: all
 Requires-Dist: sqlalchemy-cratedb[vector]; extra == "all"
 Provides-Extra: develop
-Requires-Dist: mypy<1.15; extra == "develop"
-Requires-Dist: poethepoet<0.33; extra == "develop"
-Requires-Dist: pyproject-fmt<2.6; extra == "develop"
-Requires-Dist: ruff<0.10; extra == "develop"
-Requires-Dist: validate-pyproject<0.24; extra == "develop"
+Requires-Dist: mypy<1.20; extra == "develop"
+Requires-Dist: poethepoet<1; extra == "develop"
+Requires-Dist: pyproject-fmt<3; extra == "develop"
+Requires-Dist: ruff<0.16; extra == "develop"
+Requires-Dist: validate-pyproject<1; extra == "develop"
 Provides-Extra: doc
 Requires-Dist: crate-docs-theme>=0.26.5; extra == "doc"
-Requires-Dist: sphinx<9,>=3.5; extra == "doc"
+Requires-Dist: sphinx<10,>=3.5; extra == "doc"
 Provides-Extra: release
 Requires-Dist: build<2; extra == "release"
 Requires-Dist: twine<7; extra == "release"
 Provides-Extra: test
 Requires-Dist: cratedb-toolkit[testing]; extra == "test"
-Requires-Dist: dask[dataframe]; python_version < "3.13" and extra == "test"
-Requires-Dist: pandas<2.3; extra == "test"
+Requires-Dist: dask[dataframe]; extra == "test"
+Requires-Dist: pandas<2.4; extra == "test"
 Requires-Dist: pueblo>=0.0.7; extra == "test"
-Requires-Dist: pytest<9; extra == "test"
-Requires-Dist: pytest-cov<7; extra == "test"
+Requires-Dist: pytest<10; extra == "test"
+Requires-Dist: pytest-cov<8; extra == "test"
 Requires-Dist: pytest-mock<4; extra == "test"
 Provides-Extra: vector
 Requires-Dist: numpy; extra == "vector"
+Dynamic: license-file
 
 # SQLAlchemy dialect for CrateDB
 

{sqlalchemy_cratedb-0.41.0.dev2 → sqlalchemy_cratedb-0.42.0}/pyproject.toml

@@ -7,7 +7,6 @@ requires = [
 
 [project]
 name = "sqlalchemy-cratedb"
-version = "0.41.0.dev2"
 description = "SQLAlchemy dialect for CrateDB."
 readme = "README.md"
 keywords = [
@@ -52,6 +51,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
   "Programming Language :: SQL",
@@ -78,30 +78,31 @@ classifiers = [
   "Topic :: Text Processing",
   "Topic :: Utilities",
 ]
-#dynamic = [
-#  "version",
-#]
+dynamic = [
+  "version",
+]
 dependencies = [
   "backports.zoneinfo<1; python_version<'3.9'",
-  "crate>=2.0.0.dev6,<3",
-  "geojson<4,>=2.5",
+  "crate>=2,<3",
+  "geojson>=2.5,<4",
+  "importlib-metadata; python_version<'3.8'",
   "importlib-resources; python_version<'3.9'",
-  "sqlalchemy<2.1,>=1",
-  "verlib2==0.2",
+  "sqlalchemy>=1,<2.2",
+  "verlib2<0.4",
 ]
 optional-dependencies.all = [
   "sqlalchemy-cratedb[vector]",
 ]
 optional-dependencies.develop = [
-  "mypy<1.15",
-  "poethepoet<0.33",
-  "pyproject-fmt<2.6",
-  "ruff<0.10",
-  "validate-pyproject<0.24",
+  "mypy<1.20",
+  "poethepoet<1",
+  "pyproject-fmt<3",
+  "ruff<0.16",
+  "validate-pyproject<1",
 ]
 optional-dependencies.doc = [
   "crate-docs-theme>=0.26.5",
-  "sphinx>=3.5,<9",
+  "sphinx>=3.5,<10",
 ]
 optional-dependencies.release = [
   "build<2",
@@ -109,11 +110,11 @@ optional-dependencies.release = [
 ]
 optional-dependencies.test = [
   "cratedb-toolkit[testing]",
-  "dask[dataframe]; python_version<'3.13'",
-  "pandas<2.3",
+  "dask[dataframe]",
+  "pandas<2.4",
   "pueblo>=0.0.7",
-  "pytest<9",
-  "pytest-cov<7",
+  "pytest<10",
+  "pytest-cov<8",
   "pytest-mock<4",
 ]
 optional-dependencies.vector = [
@@ -130,10 +131,7 @@ line-length = 100
 
 [tool.ruff]
 line-length = 100
-
-extend-exclude = [
-]
-
+extend-exclude = []
 lint.select = [
   # Builtins
   "A",
@@ -161,7 +159,6 @@ lint.select = [
   # flake8-2020
   "YTT",
 ]
-
 lint.extend-ignore = [
   # zip() without an explicit strict= parameter
   "B905",
@@ -169,8 +166,6 @@ lint.extend-ignore = [
   "C402",
   # Unnecessary `map` usage (rewrite using a `set` comprehension)
   "C417",
-  # df is a bad variable name. Be kinder to your future self.
-  "PD901",
   # Unnecessary variable assignment before `return` statement
   "RET504",
   # Unnecessary `elif` after `return` statement
@@ -180,11 +175,11 @@ lint.extend-ignore = [
   # Possible SQL injection vector through string-based query construction
   "S608",
 ]
-
 lint.per-file-ignores."examples/*" = [
-  "T201", # Allow `print`
+  "E501",   # Line too long
+  "ERA001", # Found commented-out code
+  "T201",   # Allow `print`
 ]
-
 lint.per-file-ignores."tests/*" = [
   "S101", # Allow use of `assert`, and `print`
   "S608", # Possible SQL injection vector through string-based query construction
@@ -192,55 +187,49 @@ lint.per-file-ignores."tests/*" = [
   "W293", # Blank line contains whitespace
 ]
 
-[tool.pytest.ini_options]
-addopts = """
+[tool.pytest]
+ini_options.addopts = """
   -rfEXs -p pytester --strict-markers --verbosity=3
   --cov --cov-report=term-missing --cov-report=xml
   """
-minversion = "2.0"
-log_level = "DEBUG"
-log_cli_level = "DEBUG"
-log_format = "%(asctime)-15s [%(name)-36s] %(levelname)-8s: %(message)s"
-pythonpath = [
+ini_options.minversion = "2.0"
+ini_options.log_level = "DEBUG"
+ini_options.log_cli_level = "DEBUG"
+ini_options.log_format = "%(asctime)-15s [%(name)-36s] %(levelname)-8s: %(message)s"
+ini_options.pythonpath = [
   "src",
 ]
-testpaths = [
+ini_options.testpaths = [
   "examples",
   "sqlalchemy_cratedb",
   "tests",
 ]
-python_files = [
+ini_options.python_files = [
   "test_*.py",
   "*_test.py",
 ]
-xfail_strict = true
-markers = [
-]
-
-[tool.coverage.paths]
-source = [
-  "src/",
-]
+ini_options.xfail_strict = true
+ini_options.markers = []
 
-[tool.coverage.run]
-branch = false
-omit = [
+[tool.coverage]
+run.branch = false
+run.omit = [
   "tests/*",
 ]
-
-[tool.coverage.report]
-fail_under = 0
-show_missing = true
-exclude_lines = [
+paths.source = [
+  "src/",
+]
+report.exclude_lines = [
   "# pragma: no cover",
   "raise NotImplemented",
 ]
+report.fail_under = 0
+report.show_missing = true
 
 [tool.mypy]
 mypy_path = "src"
 packages = [ "sqlalchemy_cratedb" ]
-exclude = [
-]
+exclude = []
 check_untyped_defs = true
 explicit_package_bases = true
 ignore_missing_imports = true
@@ -248,49 +237,41 @@ implicit_optional = true
 install_types = true
 namespace_packages = true
 non_interactive = true
-# Needed until `mypy-0.990` for `ConverterDefinition` in `converter.py`.
-# https://github.com/python/mypy/issues/731#issuecomment-1260976955
-# enable_recursive_aliases = true
-
-[tool.versioningit.vcs]
-method = "git"
-default-tag = "0.0.0"
 
+[tool.poe]
 # ===================
 # Tasks configuration
 # ===================
 
-[tool.poe.tasks]
-
-check = [
+tasks.check = [
   "lint",
   "test",
 ]
-
-format = [
+tasks.format = [
   # Format project metadata.
   { cmd = "pyproject-fmt --keep-full-version pyproject.toml" },
-
   # Format code.
   # Configure Ruff not to auto-fix a few items that are useful in workbench mode.
   # e.g.: unused imports (F401), unused variables (F841), `print` statements (T201), commented-out code (ERA001)
   { cmd = "ruff format" },
   { cmd = "ruff check --fix --ignore=ERA --ignore=F401 --ignore=F841 --ignore=T20 --ignore=ERA001" },
 ]
-
-lint = [
+tasks.lint = [
   { cmd = "ruff format --check" },
   { cmd = "ruff check" },
   { cmd = "validate-pyproject pyproject.toml" },
   # { cmd = "mypy" },
 ]
-
-release = [
+tasks.release = [
   { cmd = "python -m build" },
   { cmd = "twine upload --skip-existing dist/*" },
 ]
-
-test = [
+tasks.test = [
   { cmd = "pytest" },
   { cmd = "python -m unittest -vvv tests/integration.py" },
 ]
+
+[tool.versioningit]
+vcs.method = "git-archive"
+vcs.default-tag = "0.0.0"
+vcs.describe-subst = "$Format:%(describe:tags)$"

sqlalchemy_cratedb-0.42.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{sqlalchemy_cratedb-0.41.0.dev2 → sqlalchemy_cratedb-0.42.0}/src/sqlalchemy_cratedb/__init__.py

@@ -52,7 +52,22 @@ if SA_VERSION < SA_1_4:
     monkeypatch_add_exec_driver_sql()
 
 
+try:
+    from importlib.metadata import PackageNotFoundError, version
+except (ImportError, ModuleNotFoundError):  # pragma:nocover
+    from importlib_metadata import (  # type: ignore[assignment,no-redef,unused-ignore]
+        PackageNotFoundError,
+        version,
+    )
+
+try:
+    __version__ = version("sqlalchemy-cratedb")
+except PackageNotFoundError:  # pragma: no cover
+    __version__ = "unknown"
+
+
 __all__ = [
+    __version__,
     dialect,
     FloatVector,
     Geopoint,

{sqlalchemy_cratedb-0.41.0.dev2 → sqlalchemy_cratedb-0.42.0}/src/sqlalchemy_cratedb/compat/core14.py

@@ -317,11 +317,7 @@ def _get_crud_params(compiler, stmt, compile_state, **kw):
             _column_as_key,
             kw,
         )
-    elif (
-        not values
-        and compiler.for_executemany  # noqa: W503
-        and compiler.dialect.supports_default_metavalue  # noqa: W503
-    ):
+    elif not values and compiler.for_executemany and compiler.dialect.supports_default_metavalue:
         # convert an "INSERT DEFAULT VALUES"
         # into INSERT (firstcol) VALUES (DEFAULT) which can be turned
         # into an in-place multi values.  This supports

{sqlalchemy_cratedb-0.41.0.dev2 → sqlalchemy_cratedb-0.42.0}/src/sqlalchemy_cratedb/compat/core20.py

@@ -46,18 +46,31 @@ from sqlalchemy.sql.dml import DMLState, _DMLColumnElement
 from sqlalchemy.sql.dml import isinsert as _compile_state_isinsert
 
 from sqlalchemy_cratedb.compiler import CrateCompiler
+from sqlalchemy_cratedb.sa_version import SA_2_1, SA_VERSION
 
 
 class CrateCompilerSA20(CrateCompiler):
-    def visit_update(self, update_stmt, **kw):
+    def visit_update(self, update_stmt, visiting_cte=None, **kw):
         compile_state = update_stmt._compile_state_factory(update_stmt, self, **kw)
         update_stmt = compile_state.statement
 
-        # [20] CrateDB patch.
+        # CrateDB patch.
         if not compile_state._dict_parameters and not hasattr(update_stmt, "_crate_specific"):
-            return super().visit_update(update_stmt, **kw)
+            if SA_VERSION >= SA_2_1:
+                return super().visit_update(update_stmt, visiting_cte=visiting_cte, **kw)
+            else:
+                return super().visit_update(update_stmt, **kw)
+
+        # SA 2.1 introduced visiting_cte for CTE support.
+        if SA_VERSION >= SA_2_1:
+            if visiting_cte is not None:
+                kw["visiting_cte"] = visiting_cte
+                toplevel = False
+            else:
+                toplevel = not self.stack
+        else:
+            toplevel = not self.stack
 
-        toplevel = not self.stack
         if toplevel:
             self.isupdate = True
             if not self.dml_compile_state:
@@ -152,7 +165,11 @@ class CrateCompilerSA20(CrateCompiler):
             if t:
                 text += " WHERE " + t
 
-        limit_clause = self.update_limit_clause(update_stmt)
+        # SA 2.1 renamed update_limit_clause to update_post_criteria_clause.
+        if SA_VERSION >= SA_2_1:
+            limit_clause = self.update_post_criteria_clause(update_stmt, **kw)
+        else:
+            limit_clause = self.update_limit_clause(update_stmt)
         if limit_clause:
             text += " " + limit_clause
 
@@ -275,7 +292,8 @@ def _get_crud_params(
         assert mp is not None
         spd = mp[0]
         stmt_parameter_tuples = list(spd.items())
-    elif compile_state._ordered_values:
+    elif SA_VERSION < SA_2_1 and compile_state._ordered_values:
+        # _ordered_values was removed in SA 2.1.
         spd = compile_state._dict_parameters
         stmt_parameter_tuples = compile_state._ordered_values
     elif compile_state._dict_parameters:

{sqlalchemy_cratedb-0.41.0.dev2 → sqlalchemy_cratedb-0.42.0}/src/sqlalchemy_cratedb/compiler.py

@@ -214,6 +214,9 @@ class CrateTypeCompiler(compiler.GenericTypeCompiler):
     def visit_DECIMAL(self, type_, **kw):
         return "DOUBLE"
 
+    def visit_double(self, type_, **kw):
+        return "DOUBLE"
+
     def visit_BIGINT(self, type_, **kw):
         return "LONG"
 

{sqlalchemy_cratedb-0.41.0.dev2 → sqlalchemy_cratedb-0.42.0}/src/sqlalchemy_cratedb/dialect.py

@@ -20,10 +20,12 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 import logging
+import warnings
 from datetime import date, datetime
 
 from sqlalchemy import types as sqltypes
 from sqlalchemy.engine import default, reflection
+from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.sql import functions
 from sqlalchemy.util import asbool, to_list
 
@@ -34,6 +36,7 @@ from .compiler import (
 )
 from .sa_version import SA_1_4, SA_2_0, SA_VERSION
 from .type import FloatVector, ObjectArray, ObjectType
+from .util import SSLMode
 
 TYPES_MAP = {
     "boolean": sqltypes.Boolean,
@@ -160,7 +163,6 @@ colspecs = {
     sqltypes.TIMESTAMP: DateTime,
 }
 
-
 if SA_VERSION >= SA_2_0:
     from .compat.core20 import CrateCompilerSA20
 
@@ -226,12 +228,41 @@ class CrateDialect(default.DefaultDialect):
         if "servers" in kwargs:
             server = kwargs.pop("servers")
         servers = to_list(server)
-        if servers:
-            use_ssl = asbool(kwargs.pop("ssl", False))
-            if use_ssl:
-                servers = ["https://" + server for server in servers]
-            return self.dbapi.connect(servers=servers, **kwargs)
-        return self.dbapi.connect(**kwargs)
+
+        # Process legacy SSL option `ssl`.
+        if "ssl" in kwargs:
+            warnings.warn(
+                "The `ssl=true` option will be deprecated, "
+                "please use `sslmode=require` going forward.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        use_ssl = asbool(kwargs.pop("ssl", False))
+
+        # Process new SSL option `sslmode`.
+        # Please consult https://www.postgresql.org/docs/18/libpq-connect.html.
+        if "sslmode" in kwargs:
+            try:
+                sslmode = SSLMode.parse(kwargs.pop("sslmode"))
+            except AttributeError as exc:
+                modes = ", ".join(SSLMode.modes)
+                raise SQLAlchemyError(
+                    "`sslmode` parameter must be one of: {}".format(modes)
+                ) from exc
+            if sslmode < SSLMode.allow:
+                use_ssl = False
+            else:
+                use_ssl = True
+                if sslmode >= SSLMode.verify_ca:
+                    kwargs["verify_ssl_cert"] = True
+                else:
+                    kwargs["verify_ssl_cert"] = False
+
+        if not servers:
+            servers = [self.dbapi.http.Client.default_server.replace("http://", "")]
+        if use_ssl:
+            servers = ["https://" + server for server in servers]
+        return self.dbapi.connect(servers=servers, **kwargs)
 
     def do_execute(self, cursor, statement, parameters, context=None):
         """

{sqlalchemy_cratedb-0.41.0.dev2 → sqlalchemy_cratedb-0.42.0}/src/sqlalchemy_cratedb/sa_version.py

@@ -26,3 +26,4 @@ SA_VERSION = Version(sa.__version__)
 
 SA_1_4 = Version("1.4.0b1")
 SA_2_0 = Version("2.0.0")
+SA_2_1 = Version("2.1.0b1")

{sqlalchemy_cratedb-0.41.0.dev2 → sqlalchemy_cratedb-0.42.0}/src/sqlalchemy_cratedb/support/polyfill.py

@@ -56,11 +56,10 @@ def check_uniqueness_factory(sa_entity, *attribute_names):
                 stmt = stmt.filter(
                     getattr(sa_entity, attribute_name) == getattr(target, attribute_name)
                 )
-            stmt = stmt.compile(bind=connection.engine)
             results = connection.execute(stmt)
             if results.rowcount > 0:
                 raise IntegrityError(
-                    statement=stmt,
+                    statement=str(stmt),
                     params=[],
                     orig=Exception(
                         f"DuplicateKeyException in table '{target.__tablename__}' "

sqlalchemy_cratedb-0.42.0/src/sqlalchemy_cratedb/util.py

@@ -0,0 +1,27 @@
+import enum
+
+from sqlalchemy.util import classproperty
+
+
+class SSLMode(enum.IntEnum):
+    """
+    SSLMode class from asyncpg, with a little improvement.
+    https://github.com/MagicStack/asyncpg/blob/v0.31.0/asyncpg/connect_utils.py#L36-L48
+    """
+
+    disable = 0
+    allow = 1
+    prefer = 2
+    require = 3
+    verify_ca = 4
+    verify_full = 5
+
+    @classmethod
+    def parse(cls, sslmode):
+        if isinstance(sslmode, cls):
+            return sslmode
+        return getattr(cls, sslmode.replace("-", "_"))
+
+    @classproperty
+    def modes(cls):
+        return [m.name.replace("_", "-") for m in cls]