Publish test result to pipeline, Fix some Django 3.2 errors

Author: absci

azure-pipelines.yml

@@ -77,6 +77,13 @@ jobs:
           codeCoverageTool: 'Cobertura'
           summaryFileLocation: 'C:\Windows\ServiceProfiles\NetworkService\coverage.xml'
 
+      - task: PublishTestResults@2
+        displayName: Publish test results via jUnit
+        inputs:
+          testResultsFormat: 'JUnit'
+          testResultsFiles: 'C:\Windows\ServiceProfiles\NetworkService\result.xml'
+          testRunTitle: 'junit-$(Agent.OS)-$(Agent.OSArchitecture)-$(tox.env)'
+
   - job: Linux
     pool:
       vmImage: ubuntu-18.04
@@ -144,3 +151,10 @@ jobs:
         inputs:
           codeCoverageTool: 'Cobertura'
           summaryFileLocation: '/home/vsts/coverage.xml'
+
+      - task: PublishTestResults@2
+        displayName: Publish test results via jUnit
+        inputs:
+          testResultsFormat: 'JUnit'
+          testResultsFiles: '/home/vsts/result.xml'
+          testRunTitle: 'junit-$(Agent.OS)-$(Agent.OSArchitecture)-$(tox.env)'

mssql/base.py

@@ -93,6 +93,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         'OneToOneField': 'int',
         'PositiveIntegerField': 'int',
         'PositiveSmallIntegerField': 'smallint',
+        'PositiveBigIntegerField' : 'bigint',
         'SlugField': 'nvarchar(%(max_length)s)',
         'SmallAutoField': 'smallint',
         'SmallIntegerField': 'smallint',
@@ -109,6 +110,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         'JSONField': '(ISJSON ("%(column)s") = 1)',
         'PositiveIntegerField': '[%(column)s] >= 0',
         'PositiveSmallIntegerField': '[%(column)s] >= 0',
+        'PositiveBigIntegerField': '[%(column)s] >= 0',
     }
     operators = {
         # Since '=' is used not only for string comparision there is no way

mssql/features.py

@@ -15,6 +15,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     can_use_chunked_reads = False
     for_update_after_from = True
     greatest_least_ignores_nulls = True
+    has_json_object_function = False
     has_json_operators = False
     has_native_json_field = False
     has_native_uuid_field = False
@@ -29,6 +30,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     requires_sqlparse_for_splitting = False
     supports_boolean_expr_in_select_clause = False
     supports_deferrable_unique_constraints = False
+    supports_expression_indexes = False
     supports_ignore_conflicts = False
     supports_index_on_text_field = False
     supports_json_field_contains = False

mssql/functions.py

@@ -17,6 +17,9 @@
         KeyTransform, KeyTransformIn, KeyTransformExact,
         HasKeyLookup, compile_json_path)
 
+if VERSION >= (3, 2):
+    from django.db.models.functions.math import Random
+
 DJANGO3 = VERSION[0] >= 3
 
 
@@ -59,6 +62,8 @@ def sqlserver_nth_value(self, compiler, connection, **extra_content):
 def sqlserver_round(self, compiler, connection, **extra_context):
     return self.as_sql(compiler, connection, template='%(function)s(%(expressions)s, 0)', **extra_context)
 
+def sqlserver_random(self, compiler, connection, **extra_context):
+    return self.as_sql(compiler, connection, function='RAND', **extra_context)
 
 def sqlserver_window(self, compiler, connection, template=None):
     # MSSQL window functions require an OVER clause with ORDER BY
@@ -195,6 +200,9 @@ def json_HasKeyLookup(self, compiler, connection):
 Round.as_microsoft = sqlserver_round
 Window.as_microsoft = sqlserver_window
 
+if VERSION >= (3, 2):
+    Random.as_microsoft = sqlserver_random
+
 if DJANGO3:
     Lookup.as_microsoft = sqlserver_lookup
 else:

mssql/introspection.py

@@ -3,6 +3,7 @@
 
 import pyodbc as Database
 
+from django import VERSION
 from django.db.backends.base.introspection import (
     BaseDatabaseIntrospection, FieldInfo, TableInfo,
 )
@@ -97,7 +98,11 @@ def get_table_description(self, cursor, table_name, identity_check=True):
         """
 
         # map pyodbc's cursor.columns to db-api cursor description
-        columns = [[c[3], c[4], None, c[6], c[6], c[8], c[10], c[12]] for c in cursor.columns(table=table_name)]
+        if VERSION >= (3, 2):
+            columns = [[c[3], c[4], None, c[6], c[6], c[8], c[10], c[12], ''] for c in cursor.columns(table=table_name)]
+        else:
+            columns = [[c[3], c[4], None, c[6], c[6], c[8], c[10], c[12]] for c in cursor.columns(table=table_name)]
+
         items = []
         for column in columns:
             if identity_check and self._is_auto_field(cursor, table_name, column[0]):

mssql/operations.py

@@ -143,7 +143,7 @@ def date_interval_sql(self, timedelta):
             sql = 'DATEADD(microsecond, %d%%s, CAST(%s AS datetime2))' % (timedelta.microseconds, sql)
         return sql
 
-    def date_trunc_sql(self, lookup_type, field_name):
+    def date_trunc_sql(self, lookup_type, field_name, tzname=''):
         CONVERT_YEAR = 'CONVERT(varchar, DATEPART(year, %s))' % field_name
         CONVERT_QUARTER = 'CONVERT(varchar, 1+((DATEPART(quarter, %s)-1)*3))' % field_name
         CONVERT_MONTH = 'CONVERT(varchar, DATEPART(month, %s))' % field_name
@@ -465,7 +465,7 @@ def adapt_datetimefield_value(self, value):
             value = value.astimezone(self.connection.timezone).replace(tzinfo=None)
         return value
 
-    def time_trunc_sql(self, lookup_type, field_name):
+    def time_trunc_sql(self, lookup_type, field_name, tzname=''):
         # if self.connection.sql_server_version >= 2012:
         #    fields = {
         #        'hour': 'DATEPART(hour, %s)' % field_name,

test.sh

@@ -10,7 +10,7 @@ DJANGO_VERSION="$(python -m django --version)"
 cd django
 git fetch --depth=1 origin +refs/tags/*:refs/tags/*
 git checkout $DJANGO_VERSION
-pip install -r tests/requirements/py3.txt coverage
+pip install -r tests/requirements/py3.txt
 
 coverage run tests/runtests.py --settings=testapp.settings --noinput \
     aggregation \
@@ -110,4 +110,6 @@ coverage run tests/runtests.py --settings=testapp.settings --noinput \
     update_only_fields
 
 python -m coverage xml --include '*mssql*' --omit '*virtualenvs*'
-mv coverage.xml ~/
+
+# For Azure Pipelines
+cp -f coverage.xml result.xml ~/

testapp/runners.py

@@ -1,6 +1,9 @@
 from django.test.runner import DiscoverRunner
 from django.conf import settings
 
+from unittest import skip
+import xmlrunner
+
 EXCLUDED_TESTS = getattr(settings, 'EXCLUDED_TESTS', [])
 REGEX_TESTS = getattr(settings, 'REGEX_TESTS', [])
 
@@ -12,11 +15,22 @@ def build_suite(self, *args, **kwargs):
         suite = super().build_suite(*args, **kwargs)
         tests = []
         for case in suite:
+            test_name = case._testMethodName
             if ENABLE_REGEX_TESTS:
-                if not case.id() in EXCLUDED_TESTS:
-                    tests.append(case)
+                if case.id() in EXCLUDED_TESTS:
+                    setattr(case, test_name, skip("Not supported")(getattr(case, test_name)))
             else:
-                if not case.id() in EXCLUDED_TESTS + REGEX_TESTS:
-                    tests.append(case)
+                if case.id() in EXCLUDED_TESTS + REGEX_TESTS:
+                    setattr(case, test_name, skip("Not supported")(getattr(case, test_name)))
+            tests.append(case)
         suite._tests = tests
         return suite
+
+    def run_suite(self, suite):
+        kwargs = dict(
+            verbosity=1, descriptions=False,
+            failfast=self.failfast)
+
+        with open('./result.xml', 'wb') as xml:
+            return xmlrunner.XMLTestRunner(
+                output=xml, **kwargs).run(suite)

testapp/settings.py

@@ -179,10 +179,6 @@
                   'expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_xor_null',
                   'inspectdb.tests.InspectDBTestCase.test_number_field_types',
                   'inspectdb.tests.InspectDBTestCase.test_json_field',
-                  'model_fields.test_integerfield.PositiveBigIntegerFieldTests.test_backend_range_save',
-                  'model_fields.test_integerfield.PositiveBigIntegerFieldTests.test_coercing',
-                  'model_fields.test_integerfield.PositiveBigIntegerFieldTests.test_documented_range',
-                  'model_fields.test_integerfield.PositiveBigIntegerFieldTests.test_types',
                   'ordering.tests.OrderingTests.test_default_ordering_by_f_expression',
                   'ordering.tests.OrderingTests.test_order_by_nulls_first',
                   'ordering.tests.OrderingTests.test_order_by_nulls_last',
@@ -203,8 +199,8 @@
                   'model_fields.test_jsonfield.TestQuerying.test_none_key',
                   'model_fields.test_jsonfield.TestQuerying.test_none_key_and_exact_lookup',
                   'model_fields.test_jsonfield.TestQuerying.test_key_escape',
-
                   'model_fields.test_jsonfield.TestQuerying.test_ordering_by_transform',
+                  'expressions_window.tests.WindowFunctionTests.test_key_transform',
                   ]
 
 REGEX_TESTS = ['lookup.tests.LookupTests.test_regex',

tox.ini

@@ -16,6 +16,9 @@ commands =
     bash test.sh
 
 deps =
+    coverage
+    unittest-xml-reporting
+
     django22: django==2.2.*
     django30: django>=3.0,<3.1
     django31: django>=3.1,<3.2