Skip to content

Commit 0e625bd

Browse files
committed
drop support for CockroachDB 23.2
1 parent 812418d commit 0e625bd

File tree

3 files changed

+5
-27
lines changed

3 files changed

+5
-27
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
include:
32-
- crdb-version: v23.2.21
33-
- crdb-version: v23.2.21
34-
use_psycopg2: psycopg2
35-
- crdb-version: v23.2.21
36-
use_server_side_binding: server_side_binding
3732
- crdb-version: v24.1.14
3833
- crdb-version: v24.1.14
3934
use_psycopg2: psycopg2

django_cockroachdb/features.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
class DatabaseFeatures(PostgresDatabaseFeatures):
8-
minimum_database_version = (23, 2)
8+
minimum_database_version = (24, 1)
99

1010
# Cloning databases doesn't speed up tests.
1111
# https://github.com/cockroachdb/django-cockroachdb/issues/206
@@ -75,10 +75,6 @@ def introspected_field_types(self):
7575
'virtual': None,
7676
}
7777

78-
@cached_property
79-
def is_cockroachdb_24_1(self):
80-
return self.connection.cockroachdb_version >= (24, 1)
81-
8278
@cached_property
8379
def is_cockroachdb_24_3(self):
8480
return self.connection.cockroachdb_version >= (24, 3)
@@ -181,6 +177,10 @@ def django_test_expected_failures(self):
181177
# new primary key in same transaction
182178
'schema.tests.SchemaTests.test_add_auto_field',
183179
'schema.tests.SchemaTests.test_autofield_to_o2o',
180+
# USING cast required: https://github.com/cockroachdb/cockroach/issues/82416#issuecomment-2029803229
181+
'schema.tests.SchemaTests.test_alter_text_field_to_date_field',
182+
'schema.tests.SchemaTests.test_alter_text_field_to_datetime_field',
183+
'schema.tests.SchemaTests.test_alter_text_field_to_time_field',
184184
# incompatible COALESCE expressions: unsupported binary operator:
185185
# <int> * <int> (desired <decimal>):
186186
# https://github.com/cockroachdb/cockroach/issues/73587
@@ -202,13 +202,6 @@ def django_test_expected_failures(self):
202202
# concat(): unknown signature: concat(string, int2) (desired <string>)
203203
'db_functions.text.test_concat.ConcatTests.test_concat_non_str',
204204
})
205-
if self.is_cockroachdb_24_1:
206-
# USING cast required: https://github.com/cockroachdb/cockroach/issues/82416#issuecomment-2029803229
207-
expected_failures.update({
208-
'schema.tests.SchemaTests.test_alter_text_field_to_date_field',
209-
'schema.tests.SchemaTests.test_alter_text_field_to_datetime_field',
210-
'schema.tests.SchemaTests.test_alter_text_field_to_time_field',
211-
})
212205
if self.is_cockroachdb_25_1:
213206
expected_failures.update({
214207
# expected STORED COMPUTED COLUMN expression to have type

django_cockroachdb_gis/features.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from django.contrib.gis.db.backends.postgis.features import (
22
DatabaseFeatures as PostGISFeatures,
33
)
4-
from django.db.backends.postgresql.psycopg_any import is_psycopg3
54
from django.utils.functional import cached_property
65

76
from django_cockroachdb.features import DatabaseFeatures as CockroachFeatures
@@ -74,15 +73,6 @@ def django_test_expected_failures(self):
7473
# https://github.com/cockroachdb/cockroach/issues/47420#issuecomment-969578772
7574
'gis_tests.gis_migrations.test_operations.OperationTests.test_add_3d_field_opclass',
7675
})
77-
if is_psycopg3 and not self.is_cockroachdb_24_1:
78-
expected_failures.update({
79-
# QuerySet.bulk_create() doesn't work with geometries after
80-
# https://github.com/django/django/commit/a16eedcf9c69d8a11d94cac1811018c5b996d491
81-
# could not parse geometry: error parsing EWKB hex: encoding/hex:
82-
# invalid byte: U+003A ':'
83-
# https://github.com/cockroachdb/cockroach/issues/138140
84-
'gis_tests.geoapp.test_functions.GISFunctionsTests.test_area_lookups',
85-
})
8676
if self.uses_server_side_binding:
8777
expected_failures.update({
8878
# unknown signature: st_scale(geometry, int, int)

0 commit comments

Comments
 (0)