Merge pull request #58 from microsoft/dev

Prepare for 1.0 release

Author: absci

README.md

@@ -10,7 +10,7 @@ We hope you enjoy using the MSSQL-Django 3rd party backend.
 
 ## Features
 
--  Supports Django 2.2, 3.0 and 3.1
+-  Supports Django 2.2, 3.0, 3.1 and 3.2
 -  Tested on Microsoft SQL Server 2016, 2017, 2019
 -  Passes most of the tests of the Django test suite
 -  Compatible with
@@ -20,13 +20,11 @@ We hope you enjoy using the MSSQL-Django 3rd party backend.
 
 ## Dependencies
 
--  Django 2.2, 3.0 or 3.1
 -  pyodbc 3.0 or newer
 
 ## Installation
 
-1. Install pyodbc 3.0 (or newer) and Django 2.2, 3.0 or 3.1
-
+1. Install pyodbc 3.0 (or newer) and Django
 2. Install mssql-django:
 
        pip install mssql-django
@@ -220,20 +218,27 @@ Here is an example of the database settings:
 
 ## Limitations
 
-The following features are currently not supported:
-- mssql-django does not support SQL-based regex commands
-- Altering a model field from or to AutoField at migration  
-
-Certain limitations for JSONField lookups, more details [here](https://github.com/microsoft/mssql-django/wiki/JSONField).
-
-## Future Plans
-
-The following features and additions are planned:
-- install instructions for CLR .dll file to add SQL-based regex command support to SQL Server or Azure SQL DB
+The following features are currently not fully supported:
+- Altering a model field from or to AutoField at migration
+- Django annotate functions have floating point arithmetic problems in some cases
+- Annotate function with exists
+- Exists function in order_by
+- Righthand power and arithmetic with datatimes
+- Timezones, timedeltas not fully supported
+- `bulk_update` multiple field to null
+- Rename field/model with foreign key constraint
+- Database level constraints
+- Math degrees power or radians
+- Bit-shift operators
+- Filtered index
+- Date extract function
+- Hashing functions
+
+JSONField lookups have limitations, more details [here](https://github.com/microsoft/mssql-django/wiki/JSONField).
 
 ## Contributing
 
-More details on contributing can be found [Here](CONTRIBUTING.md).
+More details on contributing can be found [here](CONTRIBUTING.md).
 
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a
 Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us

azure-pipelines.yml

@@ -1,9 +1,7 @@
 trigger:
   - master
   - dev
-
-variables:
-  agent.preferPowerShellOnContainers: true
+  - 1ES
 
 schedules:
 - cron: "0 9 * * *"
@@ -14,9 +12,98 @@ schedules:
   always: true
 
 jobs:
+  - job: Windows
+    pool:
+      name: Django-1ES-pool
+      demands:
+      - imageOverride -equals MMS2016
+    timeoutInMinutes: 120
+
+    strategy:
+      matrix:
+        Python 3.9 - Django 3.2:
+          python.version: '3.9'
+          tox.env: 'py39-django32'
+        Python 3.8 - Django 3.2:
+          python.version: '3.8'
+          tox.env: 'py38-django32'
+        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'
+
+        Python 3.9 - Django 3.1:
+          python.version: '3.9'
+          tox.env: 'py39-django31'
+        Python 3.8 - Django 3.1:
+          python.version: '3.8'
+          tox.env: 'py38-django31'
+        Python 3.7 - Django 3.1:
+          python.version: '3.7'
+          tox.env: 'py37-django31'
+        Python 3.6 - Django 3.1:
+          python.version: '3.6'
+          tox.env: 'py36-django31'
+
+        Python 3.9 - Django 3.0:
+          python.version: '3.9'
+          tox.env: 'py39-django30'
+        Python 3.8 - Django 3.0:
+          python.version: '3.8'
+          tox.env: 'py38-django30'
+        Python 3.7 - Django 3.0:
+          python.version: '3.7'
+          tox.env: 'py37-django30'
+        Python 3.6 - Django 3.0:
+          python.version: '3.6'
+          tox.env: 'py36-django30'
+
+        Python 3.7 - Django 2.2:
+          python.version: '3.7'
+          tox.env: 'py37-django22'
+        Python 3.6 - Django 2.2:
+          python.version: '3.6'
+          tox.env: 'py36-django22'
+
+    steps:
+      - task: CredScan@2
+        inputs:
+          toolMajorVersion: 'V2'
+
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: "$(python.version)"
+        displayName: Use Python $(python.version)
+
+      - powershell: |
+          $IP=Get-NetIPAddress -AddressFamily IPv4 -InterfaceIndex $(Get-NetConnectionProfile -IPv4Connectivity Internet | Select-Object -ExpandProperty InterfaceIndex) | Select-Object -ExpandProperty IPAddress
+
+          (Get-Content $pwd/testapp/settings.py).replace('localhost', $IP) | Set-Content $pwd/testapp/settings.py
+
+          Invoke-WebRequest https://download.microsoft.com/download/E/6/B/E6BFDC7A-5BCD-4C51-9912-635646DA801E/en-US/17.5.2.1/x64/msodbcsql.msi -OutFile msodbcsql.msi
+          msiexec /quiet /passive /qn /i msodbcsql.msi IACCEPTMSODBCSQLLICENSETERMS=YES
+          Get-OdbcDriver
+
+          docker pull microsoft/mssql-server-windows-developer
+          docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=MyPassword42' -p 1433:1433 -d microsoft/mssql-server-windows-developer
+          docker ps
+
+      - powershell: |
+          python -m pip install --upgrade pip wheel setuptools
+          python -m pip install tox
+          git clone https://github.com/django/django.git
+
+          python -m tox -e $(tox.env)
+        displayName: Run tox
+
   - job: Linux
     pool:
-      vmImage: ubuntu-18.04
+      name: Django-1ES-pool
+      demands:
+      - imageOverride -equals MMSUbuntu20.04
+    timeoutInMinutes: 120
 
     strategy:
       matrix:
@@ -73,10 +160,10 @@ jobs:
         displayName: Use Python $(python.version)
 
       - script: |
-          docker pull mcr.microsoft.com/mssql/server:2017-latest-ubuntu
-          docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=MyPassword42' -p 1433:1433 -d mcr.microsoft.com/mssql/server:2017-latest-ubuntu
+          docker pull mcr.microsoft.com/mssql/server:2019-latest
+          docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=MyPassword42' -p 1433:1433 -d mcr.microsoft.com/mssql/server:2019-latest
           curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
-          curl https://packages.microsoft.com/config/ubuntu/18.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
+          curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
           sudo apt-get update
           sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17 g++ unixodbc-dev libmemcached-dev
         displayName: Install SQL Server
@@ -93,11 +180,11 @@ jobs:
       - task: PublishCodeCoverageResults@1
         inputs:
           codeCoverageTool: 'Cobertura'
-          summaryFileLocation: '/home/vsts/coverage.xml'
+          summaryFileLocation: 'django/coverage.xml'
 
       - task: PublishTestResults@2
         displayName: Publish test results via jUnit
         inputs:
           testResultsFormat: 'JUnit'
-          testResultsFiles: '/home/vsts/result.xml'
+          testResultsFiles: 'result.xml'
           testRunTitle: 'junit-$(Agent.OS)-$(Agent.OSArchitecture)-$(tox.env)'

mssql/client.py

@@ -10,24 +10,24 @@
 class DatabaseClient(BaseDatabaseClient):
     executable_name = 'sqlcmd'
 
-    def runshell(self):
-        settings_dict = self.connection.settings_dict
+    @classmethod
+    def settings_to_cmd_args(cls, settings_dict, parameters):
         options = settings_dict['OPTIONS']
         user = options.get('user', settings_dict['USER'])
         password = options.get('passwd', settings_dict['PASSWORD'])
 
         driver = options.get('driver', 'ODBC Driver 13 for SQL Server')
         ms_drivers = re.compile('^ODBC Driver .* for SQL Server$|^SQL Server Native Client')
         if not ms_drivers.match(driver):
-            self.executable_name = 'isql'
+            cls.executable_name = 'isql'
 
-        if self.executable_name == 'sqlcmd':
+        if cls.executable_name == 'sqlcmd':
             db = options.get('db', settings_dict['NAME'])
             server = options.get('host', settings_dict['HOST'])
             port = options.get('port', settings_dict['PORT'])
             defaults_file = options.get('read_default_file')
 
-            args = [self.executable_name]
+            args = [cls.executable_name]
             if server:
                 if port:
                     server = ','.join((server, str(port)))
@@ -44,9 +44,11 @@ def runshell(self):
                 args += ["-i", defaults_file]
         else:
             dsn = options.get('dsn', '')
-            args = ['%s -v %s %s %s' % (self.executable_name, dsn, user, password)]
+            args = ['%s -v %s %s %s' % (cls.executable_name, dsn, user, password)]
 
-        try:
-            subprocess.check_call(args)
-        except KeyboardInterrupt:
-            pass
+        args.extend(parameters)
+        return args
+
+    def runshell(self, parameters=[]):
+        args = DatabaseClient.settings_to_cmd_args(self.connection.settings_dict, parameters)
+        subprocess.run(args, check=True)

mssql/creation.py

@@ -96,7 +96,7 @@ def install_regex_clr(self, database_name):
 
         self.enable_clr()
 
-        with self.self.cursor() as cursor:
+        with self.cursor() as cursor:
             for s in sql:
                 cursor.execute(s)
 

mssql/features.py

@@ -29,6 +29,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     requires_literal_defaults = True
     requires_sqlparse_for_splitting = False
     supports_boolean_expr_in_select_clause = False
+    supports_covering_indexes = True
     supports_deferrable_unique_constraints = False
     supports_expression_indexes = False
     supports_ignore_conflicts = False