update for Django 4.2

* update SchemaEditor._alter_column_type_sql() signature for
  django/django@ae0899b

Author: timgraham

CHANGELOG.md

@@ -1,12 +1,5 @@
 # Changelog
 
-## 4.1.1 - 2022-12-06
+## 4.2 - Unreleased
 
-- Made `dbshell` use `sslcert`, `sslkey`, `sslmode`, and `options` from the
-  `'OPTIONS'` part of the `DATABASES` setting.
-- Added support for CockroachDB 22.2, which adds support for
-  `QuerySet.select_for_update(skip_locked=True)`.
-
-## 4.1 - 2022-08-03
-
-Initial release for Django 4.1.x and CockroachDB 21.2.x and 22.1.x.
+Initial release for Django 4.2.x and CockroachDB 22.1.x and 22.2.x.

README.md

@@ -16,9 +16,9 @@ production it is advised to use the package built from sources.
 ## Install and usage
 
 Use the version of django-cockroachdb that corresponds to your version of
-Django. For example, to get the latest compatible release for Django 4.1.x:
+Django. For example, to get the latest compatible release for Django 4.2.x:
 
-`pip install django-cockroachdb==4.1.*`
+`pip install django-cockroachdb==4.2.*`
 
 The minor release number of Django doesn't correspond to the minor release
 number of django-cockroachdb. Use the latest minor release of each.

django_cockroachdb/__init__.py

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

django_cockroachdb/features.py

@@ -133,6 +133,7 @@ def django_test_expected_failures(self):
             # https://go.crdb.dev/issue/47636
             'migrations.test_executor.ExecutorTests.test_alter_id_type_with_fk',
             'migrations.test_operations.OperationTests.test_alter_field_pk_fk',
+            'migrations.test_operations.OperationTests.test_alter_field_pk_fk_char_to_int',
             'migrations.test_operations.OperationTests.test_alter_field_pk_fk_db_collation',
             'migrations.test_operations.OperationTests.test_alter_field_reloads_state_on_fk_target_changes',
             'migrations.test_operations.OperationTests.test_alter_field_reloads_state_fk_with_to_field_related_name_target_type_change',  # noqa

django_cockroachdb/schema.py

@@ -75,8 +75,7 @@ def _alter_field(self, model, old_field, new_field, old_type, new_type,
                     }
                 })
 
-    def _alter_column_type_sql(self, model, old_field, new_field, new_type):
-        self.sql_alter_column_type = 'ALTER COLUMN %(column)s TYPE %(type)s'
+    def _alter_column_type_sql(self, model, old_field, new_field, new_type, old_collation, new_collation):
         new_internal_type = new_field.get_internal_type()
         old_internal_type = old_field.get_internal_type()
         # Make ALTER TYPE with AutoField make sense.
@@ -90,6 +89,7 @@ def _alter_column_type_sql(self, model, old_field, new_field, new_type):
                     self.sql_alter_column_type % {
                         "column": self.quote_name(column),
                         "type": new_type,
+                        "collation": "",
                     },
                     [],
                 ),
@@ -99,7 +99,10 @@ def _alter_column_type_sql(self, model, old_field, new_field, new_type):
                 [],
             )
         else:
-            return BaseDatabaseSchemaEditor._alter_column_type_sql(self, model, old_field, new_field, new_type)
+            return BaseDatabaseSchemaEditor._alter_column_type_sql(
+                self, model, old_field, new_field, new_type,
+                old_collation, new_collation,
+            )
 
     def _field_should_be_indexed(self, model, field):
         # Foreign keys are automatically indexed by cockroachdb.

django_cockroachdb_gis/features.py

@@ -50,7 +50,7 @@ def django_test_expected_failures(self):
             'gis_tests.distapp.tests.DistanceFunctionsTests.test_length',
             # Unsupported ~= (https://github.com/cockroachdb/cockroach/issues/57096)
             # and @ operators (https://github.com/cockroachdb/cockroach/issues/56124).
-            'gis_tests.geogapp.tests.GeographyTest.test04_invalid_operators_functions',
+            'gis_tests.geogapp.tests.GeographyTest.test_operators_functions_unavailable_for_geography',
             # unknown function: st_3dperimeter
             # https://github.com/cockroachdb/cockroach/issues/60871
             'gis_tests.geo3d.tests.Geo3DFunctionsTests.test_perimeter',

setup.cfg

@@ -11,7 +11,7 @@ long_description_content_type = text/markdown
 classifiers =
     Development Status :: 5 - Production/Stable
     Framework :: Django
-    Framework :: Django :: 4.1
+    Framework :: Django :: 4.2
     License :: OSI Approved :: Apache Software License
     Operating System :: OS Independent
     Programming Language :: Python

teamcity-build/build-teamcity.sh

@@ -7,13 +7,13 @@ VERSION="${1:-v19.2.5}"
 
 # clone django into the repo.
 rm -rf _django_repo
-git clone --depth 1 --single-branch --branch cockroach-4.1.x https://github.com/timgraham/django _django_repo
+git clone --depth 1 --single-branch --branch cockroach-4.2.x https://github.com/timgraham/django _django_repo
 
 # install the django requirements.
 cd _django_repo/tests/
 pip3 install -e ..
 pip3 install -r requirements/py3.txt
-pip3 install -r requirements/postgres.txt
+pip3 install psycopg2
 cd ../..
 
 # install the django-cockroachdb backend.