re-work get_multi_columns

.github/workflows/ci.yml

@@ -42,8 +42,8 @@ jobs:
         crdb-version: [
           "cockroach:latest-v25.2",
           "cockroach:latest-v25.4",
-          "cockroach:latest-v26.1",
-          "cockroach:latest-v26.2"
+          "cockroach:latest-v26.2",
+          "cockroach:latest-v26.3"
         ]
         db-alias: [
           "psycopg2",

CHANGES.md

@@ -1,6 +1,10 @@
 # Version 2.0.5
 Unreleased
 
+- Re-work get_multi_columns() to 
+  - include identity column info (#297), and
+  - avoid parse error when reflecting ENUMs (#303).  
+  (CRDB 26.3+ required for full compatibility.)
 
 # Version 2.0.4
 April 23, 2026
@@ -57,150 +61,5 @@ Released February 21, 2023
   SQLAlchemy use `pip install sqlalchemy-cockroachdb<2.0.0`
 - Stopped sending telemetry data during startup.
 
-# Version 1.4.4
-Released September 9, 2022
-
-- Added `include_hidden` option to `get_columns()` to enable reflection of columns like "rowid". (#173)
-- Added support for `.with_hint()` (patch courtesy of Jonathan Dieter)
-- Updated column introspection query to work with CockroachDB v22.2.
-
-# Version 1.4.3
-Released December 10, 2021
-
-- Added preliminary support for asyncpg. See instructions in the README.
-
-# Version 1.4.2
-Released October 21, 2021
-
-- Updated version telemetry to only report major/minor version of SQLAlchemy.
-
-# Version 1.4.1
-Released October 12, 2021
-
-- Updated test suite to work with Alembic 1.7.
-
-# Version 1.4.0
-Released July 29, 2021
-
-- Add telemetry to SQLAlchemy CockroachDB
-- Telemetry is enabled by default, set disable_cockroachdb_telemetry in create_engine's connect_args field to disable.
-  - ```Example: engine = create_engine('cockroachdb://...', connect_args={"disable_cockroachdb_telemetry": True})```
-- Initial compatibility with SQLAlchemy 1.4.
-
-
-# Version 1.3.3
-Released April 26, 2021
-
-- Remove `duplicates_constraint` property for unique indexes
-
-# Version 1.3.2
-Released September 29, 2020
-
-- Stopped returning primary keys in get_indexes. (#42)
-- Enabled tests for enums and user-defined schemas for CockroachDB v20.2.
-
-# Version 1.3.1
-Released July 13, 2020
-
-- Added more support computed columns. (#119)
-- Enabled more tests from SQLAlchemy test suite in CI.
-
-# Version 1.3.0
-
-Released June 10, 2020
-
-- Removed python2 support.
-- Version number increased to 1.3.0 to indicate compatibility with SQLAlchemy 1.3.x.
-- Column type changes via Alembic are now allowed. (#96)
-- Added exponential backoff to run_transaction(). (#115)
-
-# Version 0.4.0
-
-Released April 10, 2020
-
-- Renamed package to sqlalchemy-cockroachdb.
-
-# Version 0.3.3
-
-Released October 28, 2019
-
-- Fixed error when the use_native_hstore or server_side_cursors keyword
-  arguments were specified.
-- Stopped using the deprecated sql.text.typemap parameter.
-
-# Version 0.3.2
-
-Released July 1, 2019
-
-- Removed requirement for psycopg2 so psycopg2-binary can be used as well.
-- Updated urllib3 to remove security vulnerability.
-
-# Version 0.3.1
-
-Released Feb 25, 2019
-
-- Support CockroachDB version numbers greater than 2.
-
-# Version 0.3.0
-
-Released Jan 23, 2019
-
-- Added support for more data types.
-- Improved introspection of types with modifiers (decimal, varchar).
-- Improved introspection of unique constraints.
-
-# Version 0.2.1
-
-Released Aug 16, 2018
-
-- Alembic migrations no longer attempt to run DDL statements in transactions.
-- Comments are now dropped from table definitions as CockroachDB does not support them.
-
-# Version 0.2.0
-
-Released July 16, 2018
-
-- Adapter again simultaneously compatible with CockroachDB 1.1, 2.0
-  and 2.1.
-
-# Version 0.1.5
-
-Released July 10, 2018
-
-- More compatibility improvements for JSON/JSONB support.
-
-# Version 0.1.4
-
-Released May 9, 2018
-
-- Improved compatibility of JSON/JSONB support.
-
-# Version 0.1.3
-
-Released Mar 27, 2018
-
-- Support for JSONB columns is now reported in accordance with CockroachDB 2.0.
-
-# Version 0.1.2
-
-Released Feb 7, 2018
-
-- If Alembic or `sqlalchemy-migrate` is installed, an experimental
-  `cockroachdb` dialect will be registered with those packages too.
-- The `get_foreign_keys()` introspection interface is now supported.
-- Fixed introspection of boolean columns.
-
-# Version 0.1.1
-
-Released Sep 28, 2017
-
-- Works with CockroachDB 1.0 and 1.1.
-- `get_foreign_keys()` reflection is stubbed out and always returns an empty list.
-- Reflection interfaces and the `RETURNING` clause support references to tables outside the current schema.
-- Foreign key constraints are no longer stripped out of table creation.
-
-# Version 0.1.0
-
-Released May 27, 2016
-
-- Initial release
+(For changes to earlier versions of this dialect, see CHANGES.md in the branch for
+that version.)

README.asyncpg.md

@@ -4,11 +4,6 @@ The connection URL is of the form:
 
     cockroachdb+asyncpg://root@localhost:26257/defaultdb
 
-There is a customized version of the FastAPI SQL database tutorial for
-`cockroachdb+asyncpg` available at
-
-https://github.com/gordthompson/fastapi-tutorial-cockroachdb-async
-
 ### Testing
 
 Assuming that you have an entry in test.cfg that looks something like

README.md

@@ -42,10 +42,10 @@ For more details on working with psycopg, see
 
 ## Install and usage
 
-Use `pip` to install the latest release of this dialect.
+Use `pip` to install the latest release for this version of the dialect.
 
 ```
-pip install sqlalchemy-cockroachdb
+pip install "sqlalchemy-cockroachdb~=2.0"
 ```
 
 NOTE: This version of the dialect requires SQLAlchemy 2.0.x. To work with

dev-requirements.txt

@@ -1,39 +1,39 @@
 backports-tarfile==1.2.0
     # via jaraco-context
-cachetools==7.1.1
+cachetools==7.2.0
     # via tox
-certifi==2026.4.22
+certifi==2026.7.22
     # via requests
-cffi==2.0.0
+cffi==2.1.1
     # via cryptography
-chardet==7.4.3
+chardet==7.6.0
     # via tox
-charset-normalizer==3.4.7
+charset-normalizer==3.5.1
     # via requests
 colorama==0.4.6
     # via tox
-cryptography==48.0.0
+cryptography==50.0.1
     # via secretstorage
-distlib==0.4.0
+distlib==0.4.3
     # via virtualenv
-docutils==0.22.4
+docutils==0.23
     # via readme-renderer
-filelock==3.29.0
+filelock==4.0.1
     # via
     #   python-discovery
     #   tox
     #   virtualenv
 id==1.6.1
     # via twine
-idna==3.15
+idna==3.20
     # via requests
-importlib-metadata==9.0.0
+importlib-metadata==9.0.1
     # via keyring
 jaraco-classes==3.4.0
     # via keyring
 jaraco-context==6.1.2
     # via keyring
-jaraco-functools==4.4.0
+jaraco-functools==4.6.0
     # via keyring
 jeepney==0.9.0
     # via
@@ -45,37 +45,36 @@ markdown-it-py==4.2.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-more-itertools==11.0.2
+more-itertools==11.1.0
     # via
     #   jaraco-classes
     #   jaraco-functools
-nh3==0.3.5
+nh3==0.3.7
     # via readme-renderer
-packaging==26.2
+packaging==26.3
     # via
     #   pyproject-api
     #   tox
     #   twine
-platformdirs==4.9.6
+platformdirs==4.11.12
     # via
-    #   python-discovery
     #   tox
     #   virtualenv
 pluggy==1.6.0
     # via tox
 pycparser==3.0
     # via cffi
-pygments==2.20.0
+pygments==2.21.0
     # via
     #   readme-renderer
     #   rich
-pyproject-api==1.10.0
+pyproject-api==1.11.2
     # via tox
-python-discovery==1.3.1
+python-discovery==1.6.1
     # via virtualenv
-readme-renderer==44.0
+readme-renderer==46.0
     # via twine
-requests==2.34.1
+requests==2.34.2
     # via
     #   requests-toolbelt
     #   twine
@@ -87,25 +86,16 @@ rich==15.0.0
     # via twine
 secretstorage==3.5.0
     # via keyring
-tomli==2.4.1
-    # via
-    #   pyproject-api
-    #   tox
 tox==4.34.1
     # via -r dev-requirements.in
-twine==6.2.0
+twine==7.0.0
     # via -r dev-requirements.in
-typing-extensions==4.15.0
-    # via
-    #   cryptography
-    #   tox
-    #   virtualenv
-urllib3==2.7.0
+urllib3==2.8.0
     # via
     #   id
     #   requests
     #   twine
-virtualenv==21.3.3
+virtualenv==21.11.1
     # via tox
-zipp==3.23.1
+zipp==4.1.0
     # via importlib-metadata