Fix iso_year, Mod function, Autofield.

Author: absci

sql_server/pyodbc/base.py

@@ -12,28 +12,28 @@
 except ImportError as e:
     raise ImproperlyConfigured("Error loading pyodbc module: %s" % e)
 
-from django.utils.version import get_version_tuple # noqa
+from django.utils.version import get_version_tuple  # noqa
 
 pyodbc_ver = get_version_tuple(Database.version)
 if pyodbc_ver < (3, 0):
     raise ImproperlyConfigured("pyodbc 3.0 or newer is required; you have %s" % Database.version)
 
-from django.conf import settings # noqa
-from django.db import NotSupportedError # noqa
-from django.db.backends.base.base import BaseDatabaseWrapper # noqa
-from django.utils.encoding import smart_str # noqa
-from django.utils.functional import cached_property # noqa
+from django.conf import settings  # noqa
+from django.db import NotSupportedError  # noqa
+from django.db.backends.base.base import BaseDatabaseWrapper  # noqa
+from django.utils.encoding import smart_str  # noqa
+from django.utils.functional import cached_property  # noqa
 
 if hasattr(settings, 'DATABASE_CONNECTION_POOLING'):
     if not settings.DATABASE_CONNECTION_POOLING:
         Database.pooling = False
 
-from .client import DatabaseClient # noqa
-from .creation import DatabaseCreation # noqa
-from .features import DatabaseFeatures # noqa
-from .introspection import DatabaseIntrospection # noqa
-from .operations import DatabaseOperations # noqa
-from .schema import DatabaseSchemaEditor # noqa
+from .client import DatabaseClient  # noqa
+from .creation import DatabaseCreation  # noqa
+from .features import DatabaseFeatures  # noqa
+from .introspection import DatabaseIntrospection  # noqa
+from .operations import DatabaseOperations  # noqa
+from .schema import DatabaseSchemaEditor  # noqa
 
 EDITION_AZURE_SQL_DB = 5
 
@@ -69,8 +69,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
     # be interpolated against the values of Field.__dict__ before being output.
     # If a column type is set to None, it won't be included in the output.
     data_types = {
-        'AutoField': 'int IDENTITY (1, 1)',
-        'BigAutoField': 'bigint IDENTITY (1, 1)',
+        'AutoField': 'int',
+        'BigAutoField': 'bigint',
         'BigIntegerField': 'bigint',
         'BinaryField': 'varbinary(max)',
         'BooleanField': 'bit',
@@ -90,12 +90,17 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         'PositiveIntegerField': 'int',
         'PositiveSmallIntegerField': 'smallint',
         'SlugField': 'nvarchar(%(max_length)s)',
-        'SmallAutoField': 'smallint IDENTITY (1, 1)',
+        'SmallAutoField': 'smallint',
         'SmallIntegerField': 'smallint',
         'TextField': 'nvarchar(max)',
         'TimeField': 'time',
         'UUIDField': 'char(32)',
     }
+    data_types_suffix = {
+        'AutoField': 'IDENTITY (1, 1)',
+        'BigAutoField': 'IDENTITY (1, 1)',
+        'SmallAutoField': 'IDENTITY (1, 1)',
+    }
     data_type_check_constraints = {
         'PositiveIntegerField': '[%(column)s] >= 0',
         'PositiveSmallIntegerField': '[%(column)s] >= 0',

sql_server/pyodbc/functions.py

@@ -1,7 +1,7 @@
 from django import VERSION
 from django.db.models import BooleanField
 from django.db.models.functions import Cast
-from django.db.models.functions.math import ATan2, Log, Ln, Round
+from django.db.models.functions.math import ATan2, Log, Ln, Mod, Round
 from django.db.models.expressions import Case, Exists, OrderBy, When
 from django.db.models.lookups import Lookup
 
@@ -26,6 +26,20 @@ def sqlserver_ln(self, compiler, connection, **extra_context):
     return self.as_sql(compiler, connection, function='LOG', **extra_context)
 
 
+def sqlserver_mod(self, compiler, connection):
+    # MSSQL doesn't have keyword MOD
+    expr = self.get_source_expressions()
+    number_a = compiler.compile(expr[0])
+    number_b = compiler.compile(expr[1])
+    return self.as_sql(
+        compiler, connection,
+        function="",
+        template='(ABS({a}) - FLOOR(ABS({a}) / ABS({b})) * ABS({b})) * SIGN({a}) * SIGN({b})'.format(
+            a=number_a[0], b=number_b[0]),
+        arg_joiner=""
+    )
+
+
 def sqlserver_round(self, compiler, connection, **extra_context):
     return self.as_sql(compiler, connection, template='%(function)s(%(expressions)s, 0)', **extra_context)
 
@@ -77,6 +91,7 @@ def sqlserver_orderby(self, compiler, connection):
 ATan2.as_microsoft = sqlserver_atan2
 Log.as_microsoft = sqlserver_log
 Ln.as_microsoft = sqlserver_ln
+Mod.as_microsoft = sqlserver_mod
 Round.as_microsoft = sqlserver_round
 
 if DJANGO3:

sql_server/pyodbc/operations.py

@@ -110,6 +110,8 @@ def date_extract_sql(self, lookup_type, field_name):
             return "DATEPART(weekday, %s)" % field_name
         elif lookup_type == 'week':
             return "DATEPART(iso_week, %s)" % field_name
+        elif lookup_type == 'iso_year':
+            return "YEAR(DATEADD(day, 26 - DATEPART(isoww, %s), %s))" % (field_name, field_name)
         else:
             return "DATEPART(%s, %s)" % (lookup_type, field_name)