Merge branch 'django42' into add-comments-support

Author: maikhanhbui

.github/workflows/codeql-analysis.yml

@@ -35,11 +35,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

azure-pipelines.yml

@@ -24,6 +24,9 @@ jobs:
 
     strategy:
       matrix:
+        Python3.11 - Django 4.2:
+          python.version: '3.11'
+          tox.env: 'py311-django42'
         Python3.10 - Django 4.2:
           python.version: '3.10'
           tox.env: 'py310-django42'
@@ -34,6 +37,9 @@ jobs:
           python.version: '3.8'
           tox.env: 'py38-django42'
 
+        Python3.11 - Django 4.1:
+          python.version: '3.11'
+          tox.env: 'py311-django41'
         Python3.10 - Django 4.1:
           python.version: '3.10'
           tox.env: 'py310-django41'
@@ -44,6 +50,9 @@ jobs:
           python.version: '3.8'
           tox.env: 'py38-django41'
 
+        Python3.11 - Django 4.0:
+          python.version: '3.11'
+          tox.env: 'py311-django40'
         Python3.10 - Django 4.0:
           python.version: '3.10'
           tox.env: 'py310-django40'
@@ -54,6 +63,9 @@ jobs:
           python.version: '3.8'
           tox.env: 'py38-django40'
 
+        Python3.11 - Django 3.2:
+          python.version: '3.11'
+          tox.env: 'py311-django32'
         Python 3.9 - Django 3.2:
           python.version: '3.9'
           tox.env: 'py39-django32'
@@ -63,9 +75,7 @@ jobs:
         Python 3.7 - Django 3.2:
           python.version: '3.7'
           tox.env: 'py37-django32'
-        Python 3.6 - Django 3.2:
-          python.version: '3.6'
-          tox.env: 'py36-django32'
+
 
     steps:
       - task: CredScan@2
@@ -121,6 +131,9 @@ jobs:
 
     strategy:
       matrix:
+        Python3.11 - Django 4.2:
+          python.version: '3.11'
+          tox.env: 'py311-django42'
         Python3.10 - Django 4.2:
           python.version: '3.10'
           tox.env: 'py310-django42'
@@ -131,6 +144,9 @@ jobs:
           python.version: '3.8'
           tox.env: 'py38-django42'
 
+        Python3.11 - Django 4.1:
+          python.version: '3.11'
+          tox.env: 'py311-django41'
         Python3.10 - Django 4.1:
           python.version: '3.10'
           tox.env: 'py310-django41'
@@ -141,6 +157,9 @@ jobs:
           python.version: '3.8'
           tox.env: 'py38-django41'
 
+        Python3.11 - Django 4.0:
+          python.version: '3.11'
+          tox.env: 'py311-django40'
         Python3.10 - Django 4.0:
           python.version: '3.10'
           tox.env: 'py310-django40'
@@ -151,6 +170,9 @@ jobs:
           python.version: '3.8'
           tox.env: 'py38-django40'
 
+        Python3.11 - Django 3.2:
+          python.version: '3.11'
+          tox.env: 'py311-django32'
         Python 3.9 - Django 3.2:
           python.version: '3.9'
           tox.env: 'py39-django32'
@@ -160,9 +182,6 @@ jobs:
         Python 3.7 - Django 3.2:
           python.version: '3.7'
           tox.env: 'py37-django32'
-        Python 3.6 - Django 3.2:
-          python.version: '3.6'
-          tox.env: 'py36-django32'
 
     steps:
       - task: UsePythonVersion@0

setup.py

@@ -27,7 +27,7 @@
 
 setup(
     name='mssql-django',
-    version='1.2',
+    version='1.3',
     description='Django backend for Microsoft SQL Server',
     long_description=long_description,
     long_description_content_type='text/markdown',

testapp/settings.py

@@ -117,7 +117,6 @@
     'ordering.tests.OrderingTests.test_orders_nulls_first_on_filtered_subquery',
     'get_or_create.tests.UpdateOrCreateTransactionTests.test_creation_in_transaction',
     'indexes.tests.PartialIndexTests.test_multiple_conditions',
-    'introspection.tests.IntrospectionTests.test_get_constraints',
     'migrations.test_executor.ExecutorTests.test_alter_id_type_with_fk',
     'migrations.test_operations.OperationTests.test_add_constraint_percent_escaping',
     'migrations.test_operations.OperationTests.test_alter_field_pk',
@@ -142,7 +141,6 @@
     'ordering.tests.OrderingTests.test_deprecated_values_annotate',
     'queries.test_qs_combinators.QuerySetSetOperationTests.test_limits',
     'backends.tests.BackendTestCase.test_unicode_password',
-    'introspection.tests.IntrospectionTests.test_get_table_description_types',
     'migrations.test_commands.MigrateTests.test_migrate_syncdb_app_label',
     'migrations.test_commands.MigrateTests.test_migrate_syncdb_deferred_sql_executed_with_schemaeditor',
     'migrations.test_operations.OperationTests.test_alter_field_pk_fk',
@@ -211,7 +209,6 @@
     'lookup.tests.LookupTests.test_in_ignore_none',
     'lookup.tests.LookupTests.test_in_ignore_none_with_unhashable_items',
     'queries.test_qs_combinators.QuerySetSetOperationTests.test_exists_union',
-    'introspection.tests.IntrospectionTests.test_get_constraints_unique_indexes_orders',
     'schema.tests.SchemaTests.test_ci_cs_db_collation',
     'select_for_update.tests.SelectForUpdateTests.test_unsuported_no_key_raises_error',
 
@@ -291,7 +288,17 @@
     'model_fields.test_jsonfield.TestQuerying.test_has_key_number',
 
     # Django 4.2
-    'get_or_create.tests.UpdateOrCreateTests.test_update_only_defaults_and_pre_save_fields_when_local_fields'
+    'get_or_create.tests.UpdateOrCreateTests.test_update_only_defaults_and_pre_save_fields_when_local_fields',
+    'aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_empty_condition',
+    'aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_ref_multiple_subquery_annotation',
+    'aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_ref_subquery_annotation',
+    "aggregation.tests.AggregateAnnotationPruningTests.test_referenced_group_by_annotation_kept",
+    'aggregation.tests.AggregateTestCase.test_group_by_nested_expression_with_params',
+    'expressions.tests.BasicExpressionsTests.test_aggregate_subquery_annotation',
+    'queries.test_qs_combinators.QuerySetSetOperationTests.test_union_order_with_null_first_last',
+    'queries.test_qs_combinators.QuerySetSetOperationTests.test_union_with_select_related_and_order',
+    'expressions_window.tests.WindowFunctionTests.test_limited_filter',
+    'schema.tests.SchemaTests.test_remove_ignored_unique_constraint_not_create_fk_index',
 ]
 
 REGEX_TESTS = [