update for Django 6.1

Author: timgraham

README.md

@@ -118,6 +118,7 @@ using back to Cockroach Labs. To disable this, set
    - [greatest() doesn't support arguments of different types](https://github.com/cockroachdb/django-cockroachdb/issues/74):
      `greatest(): expected <arg> to be of type <type>, found type <other type>`
    - [`SmallAutoField` generates values that are too large for any corresponding foreign keys](https://github.com/cockroachdb/django-cockroachdb/issues/84).
+   - The `BitXor` aggregate [isn't supported](https://github.com/cockroachdb/cockroach/issues/170352).
 
 - GIS:
    - Some database functions aren't supported: `AsGML`, `AsKML`, `AsSVG`,

django-test-suite/build.sh

@@ -7,7 +7,7 @@ VERSION=$1
 
 # clone django into the repo.
 rm -rf _django_repo
-git clone --depth 1 --single-branch --branch cockroach-6.0.x https://github.com/timgraham/django _django_repo
+git clone --depth 1 --single-branch --branch cockroach-6.1.x https://github.com/timgraham/django _django_repo
 
 # install the django requirements.
 cd _django_repo/tests/

django_cockroachdb/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '6.0'
+__version__ = '6.1a0'
 
 # Check Django compatibility before other imports which may fail if the
 # wrong version of Django is installed.

django_cockroachdb/features.py

@@ -48,6 +48,10 @@ class DatabaseFeatures(PostgresDatabaseFeatures):
     # https://github.com/cockroachdb/cockroach/issues/95068
     supports_comments = False
 
+    # CockroachDB doesn't support UNIQUE NULLS NOT DISTINCT:
+    # https://github.com/cockroachdb/cockroach/issues/115836
+    supports_nulls_distinct_unique_constraints = False
+
     @cached_property
     def introspected_field_types(self):
         return {
@@ -194,6 +198,14 @@ def django_test_expected_failures(self):
             'aggregation.tests.AggregateTestCase.test_aggregation_default_expression',
             # ProgrammingError: VALUES types int and float cannot be matched
             'field_defaults.tests.DefaultTests.test_bulk_create_mixed_db_defaults_function',
+            # bit_xor function not supported:
+            # https://github.com/cockroachdb/cockroach/issues/170352
+            'aggregation.tests.AggregateTestCase.test_aggregation_default_integer',
+            'aggregation.tests.AggregateTestCase.test_aggregation_default_unset',
+            'aggregation.tests.AggregateTestCase.test_aggregation_default_zero',
+            'aggregation.tests.AggregateTestCase.test_bit_xor',
+            'aggregation.tests.AggregateTestCase.test_bit_xor_on_only_false_values',
+            'aggregation.tests.AggregateTestCase.test_bit_xor_on_only_true_values',
         })
         if self.is_cockroachdb_25_1:
             expected_failures.update({

django_cockroachdb/functions.py

@@ -5,9 +5,9 @@
 )
 from django.db.models.expressions import When
 from django.db.models.functions import (
-    ACos, ASin, ATan, ATan2, Cast, Ceil, Coalesce, Collate, Cos, Cot, Degrees,
-    Exp, Floor, JSONArray, JSONObject, Ln, Log, Now, Radians, Round, Sin, Sqrt,
-    StrIndex, Tan,
+    UUID4, ACos, ASin, ATan, ATan2, Cast, Ceil, Coalesce, Collate, Cos, Cot,
+    Degrees, Exp, Floor, JSONArray, JSONObject, Ln, Log, Now, Radians, Round,
+    Sin, Sqrt, StrIndex, Tan,
 )
 
 
@@ -83,3 +83,4 @@ def register_functions():
     Round.as_cockroachdb = round_cast
     StrIndex.as_cockroachdb = StrIndex.as_postgresql
     When.as_cockroachdb = when
+    UUID4.as_cockroachdb = UUID4.as_postgresql

django_cockroachdb/schema.py

@@ -18,7 +18,10 @@ class DatabaseSchemaEditor(PostgresDatabaseSchemaEditor):
 
     # The PostgreSQL backend uses "SET CONSTRAINTS ... IMMEDIATE" after
     # creating this foreign key. This isn't supported by CockroachDB.
-    sql_create_column_inline_fk = 'CONSTRAINT %(name)s REFERENCES %(to_table)s(%(to_column)s)%(deferrable)s'
+    sql_create_column_inline_fk = (
+        'CONSTRAINT %(name)s REFERENCES %(to_table)s(%(to_column)s)'
+        '%(on_delete_db)s%(deferrable)s'
+    )
 
     # The PostgreSQL backend uses "SET CONSTRAINTS ... IMMEDIATE" after this
     # statement. This isn't supported by CockroachDB.

django_cockroachdb_gis/features.py

@@ -34,7 +34,7 @@ def django_test_expected_failures(self):
             'gis_tests.geoapp.tests.GeoLookupTest.test_gis_lookups_with_complex_expressions',
             'gis_tests.geoapp.tests.GeoLookupTest.test_relate_lookup',
             # NotSupportedError: this box2d comparison operator is experimental
-            'gis_tests.geoapp.tests.GeoLookupTest.test_contains_contained_lookups',
+            'gis_tests.geoapp.tests.GeoLookupTest.test_bbcontains',
             # unknown signature: st_distancespheroid(geometry, geometry, string)
             # https://github.com/cockroachdb/cockroach/issues/48922#issuecomment-693096502
             'gis_tests.distapp.tests.DistanceTest.test_distance_lookups_with_expression_rhs',

setup.cfg

@@ -27,7 +27,7 @@ project_urls =
 python_requires = >=3.12
 packages = find:
 install_requires =
-    django >= 6.0, < 6.1
+#    django >= 6.1, < 6.2
 
 [flake8]
 max-line-length = 119