@@ -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 )
@@ -195,22 +191,6 @@ def django_test_expected_failures(self):
195191 # ProgrammingError: VALUES types int and float cannot be matched
196192 'field_defaults.tests.DefaultTests.test_bulk_create_mixed_db_defaults_function' ,
197193 })
198- if not self .is_cockroachdb_24_3 :
199- expected_failures .update ({
200- # ALTER COLUMN TYPE requiring rewrite of on-disk data is currently
201- # not supported for columns that are part of an index.
202- # https://go.crdb.dev/issue/47636
203- 'schema.tests.SchemaTests.test_alter_primary_key_the_same_name' ,
204- 'migrations.test_operations.OperationTests.test_alter_field_reloads_state_on_fk_target_changes' ,
205- 'migrations.test_operations.OperationTests.test_alter_field_reloads_state_on_fk_with_to_field_target_changes' , # noqa
206- 'migrations.test_operations.OperationTests.test_rename_field_reloads_state_on_fk_target_changes' ,
207- # unknown signature: concat(varchar, int) (returning <string>)
208- 'migrations.test_operations.OperationTests.test_add_generated_field' ,
209- # concat(): unknown signature: concat(string, int2) (desired <string>)
210- 'db_functions.text.test_concat.ConcatTests.test_concat_non_str' ,
211- # unknown signature: concat(timestamptz, string)
212- "aggregation.tests.AggregateTestCase.test_string_agg_order_by" ,
213- })
214194 if self .is_cockroachdb_25_1 :
215195 expected_failures .update ({
216196 # expected STORED COMPUTED COLUMN expression to have type
@@ -259,6 +239,12 @@ def django_test_expected_failures(self):
259239 'queries.test_bulk_update.BulkUpdateTests.test_updated_rows_when_passing_duplicates' ,
260240 'queries.test_q.QCheckTests.test_expression' ,
261241 'queries.test_qs_combinators.QuerySetSetOperationTests.test_union_multiple_models_with_values_list_and_annotations' , # noqa
242+ # psycopg.errors.IndeterminateDatatype: replace():
243+ # replace(): replace(): concat(): could not determine data
244+ # type of placeholder $3. This worked until v24.3 added
245+ # support for non-string data to concat():
246+ # https://github.com/cockroachdb/cockroach/pull/127098#issuecomment-2492652084
247+ "model_fields.test_uuid.TestQuerying.test_filter_with_expr" ,
262248 # error in argument for $2: could not parse ":" as type int2:
263249 # strconv.ParseInt: parsing ":": invalid syntax
264250 # https://github.com/cockroachdb/cockroach/issues/136295
@@ -275,15 +261,6 @@ def django_test_expected_failures(self):
275261 # could not parse "@" as type timestamptz: parsing as type timestamp: empty or blank input
276262 "aggregation.tests.AggregateTestCase.test_string_agg_order_by" ,
277263 })
278- if self .is_cockroachdb_24_3 :
279- expected_failures .update ({
280- # psycopg.errors.IndeterminateDatatype: replace():
281- # replace(): replace(): concat(): could not determine data
282- # type of placeholder $3. This worked until v24.3 added
283- # support for non-string data to concat():
284- # https://github.com/cockroachdb/cockroach/pull/127098#issuecomment-2492652084
285- "model_fields.test_uuid.TestQuerying.test_filter_with_expr" ,
286- })
287264 if self .is_cockroachdb_25_1 :
288265 expected_failures .update ({
289266 # psycopg.errors.IndeterminateDatatype: could not determine
0 commit comments