Merge branch 'dev' into add-comments-support

Author: dauinsight

mssql/introspection.py

@@ -15,6 +15,7 @@
 
 SQL_AUTOFIELD = -777555
 SQL_BIGAUTOFIELD = -777444
+SQL_SMALLAUTOFIELD = -777333
 SQL_TIMESTAMP_WITH_TIMEZONE = -155
 
 FieldInfo = namedtuple("FieldInfo", BaseFieldInfo._fields + ("comment",))
@@ -29,6 +30,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
     data_types_reverse = {
         SQL_AUTOFIELD: 'AutoField',
         SQL_BIGAUTOFIELD: 'BigAutoField',
+        SQL_SMALLAUTOFIELD: 'SmallAutoField',
         Database.SQL_BIGINT: 'BigIntegerField',
         # Database.SQL_BINARY:            ,
         Database.SQL_BIT: 'BooleanField',
@@ -158,6 +160,8 @@ def get_table_description(self, cursor, table_name, identity_check=True):
             if identity_check and self._is_auto_field(cursor, table_name, column[0]):
                 if column[1] == Database.SQL_BIGINT:
                     column[1] = SQL_BIGAUTOFIELD
+                elif column[1] == Database.SQL_SMALLINT:
+                    column[1] = SQL_SMALLAUTOFIELD
                 else:
                     column[1] = SQL_AUTOFIELD
             if column[1] == Database.SQL_WVARCHAR and column[3] < 4000:

mssql/operations.py

@@ -178,7 +178,7 @@ def date_trunc_sql(self, lookup_type, sql, params, tzname=None):
 
             # Python formats year with leading zeroes. This preserves that format for 
             # compatibility with SQL Server's date since DATEPART drops the leading zeroes.
-            CONVERT_YEAR = 'CONVERT(varchar(4), %s)' % sql
+            CONVERT_YEAR = 'CONVERT(varchar(4), CONVERT(date, %s))' % sql
             CONVERT_QUARTER = 'CONVERT(varchar, 1+((DATEPART(quarter, %s)-1)*3))' % sql
             CONVERT_MONTH = 'CONVERT(varchar, DATEPART(month, %s))' % sql
             CONVERT_WEEK = "DATEADD(DAY, (DATEPART(weekday, %s) + 5) %%%% 7 * -1, %s)" % (sql, sql)

mssql/schema.py

@@ -348,7 +348,7 @@ def _alter_field(self, model, old_field, new_field, old_type, new_type,
         if (old_is_auto and not new_is_auto) or (not old_is_auto and new_is_auto):
             raise NotImplementedError("the backend doesn't support altering from %s to %s." %
                 (old_field.get_internal_type(), new_field.get_internal_type()))
-        
+
         # Drop any FK constraints, we'll remake them later
         fks_dropped = set()
         if old_field.remote_field and old_field.db_constraint and (django_version >= (4, 2) and self._field_should_be_altered(
@@ -830,11 +830,23 @@ def _delete_indexes(self, model, old_field, new_field):
             if old_field.column in columns:
                 index_columns.append(columns)
 
+        for index in model._meta.indexes:
+            columns = [model._meta.get_field(field).column for field in index.fields]
+            if old_field.column in columns:
+                index_columns.append(columns)
+
         for fields in model._meta.unique_together:
             columns = [model._meta.get_field(field).column for field in fields]
             if old_field.column in columns:
                 index_columns.append(columns)
         if index_columns:
+            # remove duplicates first
+            temp = []
+            for columns in index_columns:
+                if columns not in temp:
+                    temp.append(columns)
+            index_columns = temp
+
             for columns in index_columns:
                 index_names = self._constraint_names(model, columns, index=True)
                 for index_name in index_names:

testapp/settings.py

@@ -159,7 +159,6 @@
     'queries.test_db_returning.ReturningValuesTests.test_insert_returning',
     'queries.test_db_returning.ReturningValuesTests.test_insert_returning_non_integer',
     'backends.tests.BackendTestCase.test_queries',
-    'introspection.tests.IntrospectionTests.test_smallautofield',
     'schema.tests.SchemaTests.test_inline_fk',
     'aggregation.tests.AggregateTestCase.test_aggregation_subquery_annotation_exists',
     'aggregation.tests.AggregateTestCase.test_aggregation_subquery_annotation_values_collision',
@@ -292,13 +291,17 @@
     '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.AggregateAnnotationPruningTests.test_referenced_group_by_annotation_kept',
+    'aggregation.tests.AggregateAnnotationPruningTests.test_referenced_window_requires_wrapping',
+    'aggregation.tests.AggregateAnnotationPruningTests.test_unused_aliased_aggregate_and_annotation_reverse_fk',
+    'aggregation.tests.AggregateAnnotationPruningTests.test_unused_aliased_aggregate_and_annotation_reverse_fk_grouped',
     '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',
+    'constraints.tests.UniqueConstraintTests.test_validate_nullable_textfield_with_isnull_true',
 ]
 
 REGEX_TESTS = [