@@ -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 )
@@ -191,22 +187,6 @@ def django_test_expected_failures(self):
191187 # ProgrammingError: VALUES types int and float cannot be matched
192188 'field_defaults.tests.DefaultTests.test_bulk_create_mixed_db_defaults_function' ,
193189 })
194- if not self .is_cockroachdb_24_3 :
195- expected_failures .update ({
196- # ALTER COLUMN TYPE requiring rewrite of on-disk data is currently
197- # not supported for columns that are part of an index.
198- # https://go.crdb.dev/issue/47636
199- 'schema.tests.SchemaTests.test_alter_primary_key_the_same_name' ,
200- 'migrations.test_operations.OperationTests.test_alter_field_reloads_state_on_fk_target_changes' ,
201- 'migrations.test_operations.OperationTests.test_alter_field_reloads_state_on_fk_with_to_field_target_changes' , # noqa
202- 'migrations.test_operations.OperationTests.test_rename_field_reloads_state_on_fk_target_changes' ,
203- # unknown signature: concat(varchar, int) (returning <string>)
204- 'migrations.test_operations.OperationTests.test_add_generated_field' ,
205- # concat(): unknown signature: concat(string, int2) (desired <string>)
206- 'db_functions.text.test_concat.ConcatTests.test_concat_non_str' ,
207- # unknown signature: concat(timestamptz, string)
208- "aggregation.tests.AggregateTestCase.test_string_agg_order_by" ,
209- })
210190 if self .is_cockroachdb_25_1 :
211191 expected_failures .update ({
212192 # expected STORED COMPUTED COLUMN expression to have type
@@ -255,6 +235,12 @@ def django_test_expected_failures(self):
255235 'queries.test_bulk_update.BulkUpdateTests.test_updated_rows_when_passing_duplicates' ,
256236 'queries.test_q.QCheckTests.test_expression' ,
257237 'queries.test_qs_combinators.QuerySetSetOperationTests.test_union_multiple_models_with_values_list_and_annotations' , # noqa
238+ # psycopg.errors.IndeterminateDatatype: replace():
239+ # replace(): replace(): concat(): could not determine data
240+ # type of placeholder $3. This worked until v24.3 added
241+ # support for non-string data to concat():
242+ # https://github.com/cockroachdb/cockroach/pull/127098#issuecomment-2492652084
243+ "model_fields.test_uuid.TestQuerying.test_filter_with_expr" ,
258244 # error in argument for $2: could not parse ":" as type int2:
259245 # strconv.ParseInt: parsing ":": invalid syntax
260246 # https://github.com/cockroachdb/cockroach/issues/136295
@@ -271,15 +257,6 @@ def django_test_expected_failures(self):
271257 # could not parse "@" as type timestamptz: parsing as type timestamp: empty or blank input
272258 "aggregation.tests.AggregateTestCase.test_string_agg_order_by" ,
273259 })
274- if self .is_cockroachdb_24_3 :
275- expected_failures .update ({
276- # psycopg.errors.IndeterminateDatatype: replace():
277- # replace(): replace(): concat(): could not determine data
278- # type of placeholder $3. This worked until v24.3 added
279- # support for non-string data to concat():
280- # https://github.com/cockroachdb/cockroach/pull/127098#issuecomment-2492652084
281- "model_fields.test_uuid.TestQuerying.test_filter_with_expr" ,
282- })
283260 if self .is_cockroachdb_25_1 :
284261 expected_failures .update ({
285262 # psycopg.errors.IndeterminateDatatype: could not determine
0 commit comments