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

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

@@ -1,9 +1,33 @@
 # Changelog
 
-## Unreleased
+## 2026/06/17 0.43.0
+- Types: Improved support for FLOAT type, converging to FLOAT vs. DOUBLE
+- Types: Added method `ObjectArray.as_generic` for better reverse type lookups
+- Types: Improved type mappings for better reverse type lookups / reflections
+  - Consequently used upper-case type definitions from `sqlalchemy.types`
+  - Added `timestamp without time zone` types (scalar and array)
+  - On SQLAlchemy 2, mapped `real` and `double{_precision}` types to the
+    newly introduced `sqltypes.{DOUBLE,DOUBLE_PRECISION}` types
+- Compiler: Made `CREATE INDEX` a no-op, only emitting `SELECT 1`, because CrateDB
+  does not support that statement
+- Compiler: Fixed `AttributeError: 'CrateCompilerSA20' object has no attribute
+  'visit_on_conflict_do_update'` by forwarding calls to
+  `PGCompiler.visit_on_conflict_do_update`
+- Dialect: Added methods concerned with isolation levels as no-ops
+- Types: Started emulating PostgreSQL's `JSON(B)` types using CrateDB's `OBJECT`
+- Dialect: now uses `paramstyle = "pyformat"` supported in crate-python 2.2.1.
+  Because of this the SQL statements logged or inspected will contain
+  `%(name)s` placeholders instead of `?`.
+- Removed support for Python versions < 3.10
+
+## 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=prefer` to connect to SSL-enabled CrateDB instances without
-  verifying the host name.
+  `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
 

sqlalchemy_cratedb-0.43.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.42.0.dev2/src/sqlalchemy_cratedb.egg-info → sqlalchemy_cratedb-0.43.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlalchemy-cratedb
-Version: 0.42.0.dev2
+Version: 0.43.0
 Summary: SQLAlchemy dialect for CrateDB.
 Author-email: "Crate.io" <office@crate.io>
 License: Apache License 2.0
@@ -26,14 +26,11 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 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
@@ -59,38 +56,38 @@ Classifier: Topic :: System :: Networking
 Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Text Processing
 Classifier: Topic :: Utilities
-Requires-Python: >=3.6
+Requires-Python: >=3.10
 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
+Requires-Dist: crate<3,>=2.2.1
 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: 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.16; 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.12; 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]; extra == "test"
-Requires-Dist: pandas[test]<2.3; 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"

{sqlalchemy_cratedb-0.42.0.dev2 → sqlalchemy_cratedb-0.43.0}/backlog.md

@@ -21,3 +21,5 @@ From dialect split-off.
   - https://docs.sqlalchemy.org/en/20/core/connections.html#sqlalchemy.engine.Connection.execution_options.params.stream_results
   - https://docs.sqlalchemy.org/en/20/core/connections.html#sqlalchemy.engine.Result.yield_per
 - https://github.com/jamescasbon/vertica-sqlalchemy
+- pandas: `index=True`
+- @cratedb: test_table_kwargs_unknown => ColumnUnknownException[Column bazqux unknown]

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

@@ -7,10 +7,6 @@ requires = [
 
 [project]
 name = "sqlalchemy-cratedb"
-#dynamic = [
-#  "version",
-#]
-version = "0.42.0.dev2"
 description = "SQLAlchemy dialect for CrateDB."
 readme = "README.md"
 keywords = [
@@ -28,7 +24,7 @@ license = { text = "Apache License 2.0" }
 authors = [
   { name = "Crate.io", email = "office@crate.io" },
 ]
-requires-python = ">=3.6"
+requires-python = ">=3.10"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Environment :: Plugins",
@@ -47,14 +43,11 @@ classifiers = [
   "Operating System :: Unix",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.6",
-  "Programming Language :: Python :: 3.7",
-  "Programming Language :: Python :: 3.8",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "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",
@@ -81,28 +74,31 @@ classifiers = [
   "Topic :: Text Processing",
   "Topic :: Utilities",
 ]
+dynamic = [
+  "version",
+]
 dependencies = [
   "backports.zoneinfo<1; python_version<'3.9'",
-  "crate>=2,<3",
+  "crate>=2.2.1,<3",
   "geojson>=2.5,<4",
   "importlib-metadata; python_version<'3.8'",
   "importlib-resources; python_version<'3.9'",
-  "sqlalchemy>=1,<2.1",
+  "sqlalchemy>=1,<2.2",
   "verlib2<0.4",
 ]
 optional-dependencies.all = [
   "sqlalchemy-cratedb[vector]",
 ]
 optional-dependencies.develop = [
-  "mypy<1.16",
+  "mypy<1.20",
   "poethepoet<1",
   "pyproject-fmt<3",
-  "ruff<0.12",
+  "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",
@@ -111,10 +107,10 @@ optional-dependencies.release = [
 optional-dependencies.test = [
   "cratedb-toolkit[testing]",
   "dask[dataframe]",
-  "pandas[test]<2.3",
+  "pandas<2.4",
   "pueblo>=0.0.7",
-  "pytest<9",
-  "pytest-cov<7",
+  "pytest<10",
+  "pytest-cov<8",
   "pytest-mock<4",
 ]
 optional-dependencies.vector = [
@@ -131,10 +127,7 @@ line-length = 100
 
 [tool.ruff]
 line-length = 100
-
-extend-exclude = [
-]
-
+extend-exclude = []
 lint.select = [
   # Builtins
   "A",
@@ -162,7 +155,6 @@ lint.select = [
   # flake8-2020
   "YTT",
 ]
-
 lint.extend-ignore = [
   # zip() without an explicit strict= parameter
   "B905",
@@ -170,8 +162,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
@@ -181,11 +171,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
@@ -193,106 +183,90 @@ lint.per-file-ignores."tests/*" = [
   "W293", # Blank line contains whitespace
 ]
 
-[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 = [
-  "src",
-]
-testpaths = [
+[tool.mypy]
+mypy_path = "src"
+packages = [ "sqlalchemy_cratedb" ]
+exclude = []
+namespace_packages = true
+explicit_package_bases = true
+ignore_missing_imports = true
+check_untyped_defs = true
+implicit_optional = true
+install_types = true
+non_interactive = true
+
+[tool.pytest]
+ini_options.minversion = "2.0"
+ini_options.testpaths = [
   "examples",
   "sqlalchemy_cratedb",
   "tests",
 ]
-python_files = [
-  "test_*.py",
-  "*_test.py",
-]
-xfail_strict = true
-markers = [
+ini_options.pythonpath = [
+  "src",
 ]
-
-[tool.coverage.paths]
-source = [
-  "src/",
+ini_options.python_files = [
+  "*_test.py",
+  "test_*.py",
 ]
+ini_options.addopts = """
+  -rfEXs -p pytester --strict-markers --verbosity=3
+  --cov --cov-report=term-missing --cov-report=xml
+  """
+ini_options.markers = []
+ini_options.xfail_strict = true
+ini_options.log_format = "%(asctime)-15s [%(name)-36s] %(levelname)-8s: %(message)s"
+ini_options.log_level = "DEBUG"
+ini_options.log_cli_level = "DEBUG"
 
-[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 = [
-]
-check_untyped_defs = true
-explicit_package_bases = true
-ignore_missing_imports = true
-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-archive"
-default-tag = "0.0.0"
-describe-subst = "$Format:%(describe:tags)$"
-
+[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.dev2 → sqlalchemy_cratedb-0.43.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.42.0.dev2 → sqlalchemy_cratedb-0.43.0}/src/sqlalchemy_cratedb/compiler.py

@@ -213,6 +213,9 @@ class CrateDDLCompiler(compiler.DDLCompiler):
 
 
 class CrateTypeCompiler(compiler.GenericTypeCompiler):
+    visit_on_conflict_do_update = PGCompiler.visit_on_conflict_do_update
+    _on_conflict_target = PGCompiler._on_conflict_target
+
     def visit_string(self, type_, **kw):
         return "STRING"
 
@@ -225,6 +228,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"
 
@@ -265,9 +271,6 @@ class CrateTypeCompiler(compiler.GenericTypeCompiler):
         """
         return "TIMESTAMP %s" % ((type_.timezone and "WITH" or "WITHOUT") + " TIME ZONE",)
 
-    def visit_BLOB(self, type_, **kw):
-        return "STRING"
-
     def visit_FLOAT(self, type_, **kw):
         """
         From `sqlalchemy.sql.sqltypes.Float`.
@@ -282,12 +285,9 @@ class CrateTypeCompiler(compiler.GenericTypeCompiler):
         ``DOUBLE PRECISION``. Other third party dialects may have similar
         behavior.
         """
-        if not type_.precision:
-            return "FLOAT"
-        elif type_.precision <= 24:
-            return "FLOAT"
-        else:
+        if type_.precision and type_.precision > 24:
             return "DOUBLE"
+        return "FLOAT"
 
     def visit_JSON(self, type_, **kw):
         return "OBJECT"