Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion django_cockroachdb/features.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down