From c6a16337bf0ed1ad3860649060084ffcfc06cd1e Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 4 Dec 2025 20:32:27 -0500 Subject: [PATCH] confirm support for CockroachDB 26.1 --- .github/workflows/tests.yml | 10 +++++----- django_cockroachdb/features.py | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2b59473..9d1210b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -60,11 +60,11 @@ jobs: - crdb-version: v25.4.0 use_server_side_binding: server_side_binding # Uncomment to enable testing of CockroachDB nightly. - #- crdb-version: LATEST - #- crdb-version: LATEST - # use_psycopg2: psycopg2 - #- crdb-version: LATEST - # use_server_side_binding: server_side_binding + - crdb-version: LATEST + - crdb-version: LATEST + use_psycopg2: psycopg2 + - crdb-version: LATEST + use_server_side_binding: server_side_binding steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v4 diff --git a/django_cockroachdb/features.py b/django_cockroachdb/features.py index f0dfd83..9951bdc 100644 --- a/django_cockroachdb/features.py +++ b/django_cockroachdb/features.py @@ -95,6 +95,10 @@ def is_cockroachdb_25_2(self): def is_cockroachdb_25_4(self): return self.connection.cockroachdb_version >= (25, 4) + @cached_property + def is_cockroachdb_26_1(self): + return self.connection.cockroachdb_version >= (26, 1) + @cached_property def django_test_expected_failures(self): expected_failures = super().django_test_expected_failures @@ -360,7 +364,7 @@ def django_test_skips(self): 'schema.tests.SchemaTests.test_alter_field_type_and_db_collation', }, }) - if self.is_cockroachdb_25_4: + if self.is_cockroachdb_25_4 and not self.is_cockroachdb_26_1: skips.update({ # Error truncating hundreds of tables: # https://github.com/cockroachdb/cockroach/issues/156682