Skip to content

Commit f468f3e

Browse files
committed
drop support for CockroachDB 24.1
1 parent 56241d0 commit f468f3e

2 files changed

Lines changed: 6 additions & 34 deletions

File tree

.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: v24.1.14
33-
- crdb-version: v24.1.14
34-
use_psycopg2: psycopg2
35-
- crdb-version: v24.1.14
36-
use_server_side_binding: server_side_binding
3732
- crdb-version: v24.3.8
3833
- crdb-version: v24.3.8
3934
use_psycopg2: psycopg2

django_cockroachdb/features.py

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ def introspected_field_types(self):
7575
'virtual': None,
7676
}
7777

78-
@cached_property
79-
def is_cockroachdb_24_3(self):
80-
return self.connection.cockroachdb_version >= (24, 3)
81-
8278
@cached_property
8379
def is_cockroachdb_25_1(self):
8480
return self.connection.cockroachdb_version >= (25, 1)
@@ -199,22 +195,6 @@ def django_test_expected_failures(self):
199195
# ProgrammingError: VALUES types int and float cannot be matched
200196
'field_defaults.tests.DefaultTests.test_bulk_create_mixed_db_defaults_function',
201197
})
202-
if not self.is_cockroachdb_24_3:
203-
expected_failures.update({
204-
# ALTER COLUMN TYPE requiring rewrite of on-disk data is currently
205-
# not supported for columns that are part of an index.
206-
# https://go.crdb.dev/issue/47636
207-
'schema.tests.SchemaTests.test_alter_primary_key_the_same_name',
208-
'migrations.test_operations.OperationTests.test_alter_field_reloads_state_on_fk_target_changes',
209-
'migrations.test_operations.OperationTests.test_alter_field_reloads_state_on_fk_with_to_field_target_changes', # noqa
210-
'migrations.test_operations.OperationTests.test_rename_field_reloads_state_on_fk_target_changes',
211-
# unknown signature: concat(varchar, int) (returning <string>)
212-
'migrations.test_operations.OperationTests.test_add_generated_field',
213-
# concat(): unknown signature: concat(string, int2) (desired <string>)
214-
'db_functions.text.test_concat.ConcatTests.test_concat_non_str',
215-
# unknown signature: concat(timestamptz, string)
216-
"aggregation.tests.AggregateTestCase.test_string_agg_order_by",
217-
})
218198
if self.is_cockroachdb_25_1:
219199
expected_failures.update({
220200
# expected STORED COMPUTED COLUMN expression to have type
@@ -263,6 +243,12 @@ def django_test_expected_failures(self):
263243
'queries.test_bulk_update.BulkUpdateTests.test_updated_rows_when_passing_duplicates',
264244
'queries.test_q.QCheckTests.test_expression',
265245
'queries.test_qs_combinators.QuerySetSetOperationTests.test_union_multiple_models_with_values_list_and_annotations', # noqa
246+
# psycopg.errors.IndeterminateDatatype: replace():
247+
# replace(): replace(): concat(): could not determine data
248+
# type of placeholder $3. This worked until v24.3 added
249+
# support for non-string data to concat():
250+
# https://github.com/cockroachdb/cockroach/pull/127098#issuecomment-2492652084
251+
"model_fields.test_uuid.TestQuerying.test_filter_with_expr",
266252
# error in argument for $2: could not parse ":" as type int2:
267253
# strconv.ParseInt: parsing ":": invalid syntax
268254
# https://github.com/cockroachdb/cockroach/issues/136295
@@ -279,15 +265,6 @@ def django_test_expected_failures(self):
279265
# could not parse "@" as type timestamptz: parsing as type timestamp: empty or blank input
280266
"aggregation.tests.AggregateTestCase.test_string_agg_order_by",
281267
})
282-
if self.is_cockroachdb_24_3:
283-
expected_failures.update({
284-
# psycopg.errors.IndeterminateDatatype: replace():
285-
# replace(): replace(): concat(): could not determine data
286-
# type of placeholder $3. This worked until v24.3 added
287-
# support for non-string data to concat():
288-
# https://github.com/cockroachdb/cockroach/pull/127098#issuecomment-2492652084
289-
"model_fields.test_uuid.TestQuerying.test_filter_with_expr",
290-
})
291268
if self.is_cockroachdb_25_1:
292269
expected_failures.update({
293270
# psycopg.errors.IndeterminateDatatype: could not determine

0 commit comments

Comments
 (0)