use str of field as index

Author: ivissani

.tox/.package.lock

@@ -0,0 +1,119 @@
+action: GLOB, msg: packaging
+cwd: /code
+cmd: /usr/local/bin/python setup.py sdist --formats=zip --dist-dir .tox/dist
+running sdist
+running egg_info
+writing django_mssql_backend.egg-info/PKG-INFO
+writing dependency_links to django_mssql_backend.egg-info/dependency_links.txt
+writing requirements to django_mssql_backend.egg-info/requires.txt
+writing top-level names to django_mssql_backend.egg-info/top_level.txt
+reading manifest file 'django_mssql_backend.egg-info/SOURCES.txt'
+reading manifest template 'MANIFEST.in'
+warning: no previously-included files matching '*' found under directory 'docker'
+writing manifest file 'django_mssql_backend.egg-info/SOURCES.txt'
+running check
+creating django-mssql-backend-2.8.1
+creating django-mssql-backend-2.8.1/django_mssql_backend.egg-info
+creating django-mssql-backend-2.8.1/sql_server
+creating django-mssql-backend-2.8.1/sql_server/pyodbc
+creating django-mssql-backend-2.8.1/sql_server/pyodbc/management
+creating django-mssql-backend-2.8.1/sql_server/pyodbc/management/commands
+creating django-mssql-backend-2.8.1/testapp
+creating django-mssql-backend-2.8.1/testapp/migrations
+creating django-mssql-backend-2.8.1/testapp/tests
+copying files to django-mssql-backend-2.8.1...
+copying LICENSE -> django-mssql-backend-2.8.1
+copying MANIFEST.in -> django-mssql-backend-2.8.1
+copying README.rst -> django-mssql-backend-2.8.1
+copying setup.cfg -> django-mssql-backend-2.8.1
+copying setup.py -> django-mssql-backend-2.8.1
+copying django_mssql_backend.egg-info/PKG-INFO -> django-mssql-backend-2.8.1/django_mssql_backend.egg-info
+copying django_mssql_backend.egg-info/SOURCES.txt -> django-mssql-backend-2.8.1/django_mssql_backend.egg-info
+copying django_mssql_backend.egg-info/dependency_links.txt -> django-mssql-backend-2.8.1/django_mssql_backend.egg-info
+copying django_mssql_backend.egg-info/requires.txt -> django-mssql-backend-2.8.1/django_mssql_backend.egg-info
+copying django_mssql_backend.egg-info/top_level.txt -> django-mssql-backend-2.8.1/django_mssql_backend.egg-info
+copying sql_server/__init__.py -> django-mssql-backend-2.8.1/sql_server
+copying sql_server/pyodbc/__init__.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/base.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/client.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/compiler.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/creation.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/features.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/functions.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/introspection.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/operations.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/regex_clr.dll -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/schema.py -> django-mssql-backend-2.8.1/sql_server/pyodbc
+copying sql_server/pyodbc/management/__init__.py -> django-mssql-backend-2.8.1/sql_server/pyodbc/management
+copying sql_server/pyodbc/management/commands/__init__.py -> django-mssql-backend-2.8.1/sql_server/pyodbc/management/commands
+copying sql_server/pyodbc/management/commands/install_regex_clr.py -> django-mssql-backend-2.8.1/sql_server/pyodbc/management/commands
+copying testapp/__init__.py -> django-mssql-backend-2.8.1/testapp
+copying testapp/models.py -> django-mssql-backend-2.8.1/testapp
+copying testapp/settings.py -> django-mssql-backend-2.8.1/testapp
+copying testapp/migrations/0001_initial.py -> django-mssql-backend-2.8.1/testapp/migrations
+copying testapp/migrations/0002_test_unique_nullable_part1.py -> django-mssql-backend-2.8.1/testapp/migrations
+copying testapp/migrations/0003_test_unique_nullable_part2.py -> django-mssql-backend-2.8.1/testapp/migrations
+copying testapp/migrations/0004_test_issue45_unique_type_change_part1.py -> django-mssql-backend-2.8.1/testapp/migrations
+copying testapp/migrations/0005_test_issue45_unique_type_change_part2.py -> django-mssql-backend-2.8.1/testapp/migrations
+copying testapp/migrations/0006_test_remove_onetoone_field_part1.py -> django-mssql-backend-2.8.1/testapp/migrations
+copying testapp/migrations/0007_test_remove_onetoone_field_part2.py -> django-mssql-backend-2.8.1/testapp/migrations
+copying testapp/migrations/0008_test_alter_nullable_in_unique_field.py -> django-mssql-backend-2.8.1/testapp/migrations
+copying testapp/migrations/__init__.py -> django-mssql-backend-2.8.1/testapp/migrations
+copying testapp/tests/__init__.py -> django-mssql-backend-2.8.1/testapp/tests
+copying testapp/tests/test_constraints.py -> django-mssql-backend-2.8.1/testapp/tests
+copying testapp/tests/test_expressions.py -> django-mssql-backend-2.8.1/testapp/tests
+copying testapp/tests/test_fields.py -> django-mssql-backend-2.8.1/testapp/tests
+Writing django-mssql-backend-2.8.1/setup.cfg
+creating '.tox/dist/django-mssql-backend-2.8.1.zip' and adding 'django-mssql-backend-2.8.1' to it
+adding 'django-mssql-backend-2.8.1'
+adding 'django-mssql-backend-2.8.1/sql_server'
+adding 'django-mssql-backend-2.8.1/testapp'
+adding 'django-mssql-backend-2.8.1/django_mssql_backend.egg-info'
+adding 'django-mssql-backend-2.8.1/PKG-INFO'
+adding 'django-mssql-backend-2.8.1/LICENSE'
+adding 'django-mssql-backend-2.8.1/MANIFEST.in'
+adding 'django-mssql-backend-2.8.1/setup.py'
+adding 'django-mssql-backend-2.8.1/setup.cfg'
+adding 'django-mssql-backend-2.8.1/README.rst'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc'
+adding 'django-mssql-backend-2.8.1/sql_server/__init__.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/management'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/functions.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/compiler.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/creation.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/client.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/__init__.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/features.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/operations.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/introspection.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/regex_clr.dll'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/base.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/schema.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/management/commands'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/management/__init__.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/management/commands/__init__.py'
+adding 'django-mssql-backend-2.8.1/sql_server/pyodbc/management/commands/install_regex_clr.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations'
+adding 'django-mssql-backend-2.8.1/testapp/tests'
+adding 'django-mssql-backend-2.8.1/testapp/models.py'
+adding 'django-mssql-backend-2.8.1/testapp/__init__.py'
+adding 'django-mssql-backend-2.8.1/testapp/settings.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations/0003_test_unique_nullable_part2.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations/0005_test_issue45_unique_type_change_part2.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations/0008_test_alter_nullable_in_unique_field.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations/__init__.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations/0004_test_issue45_unique_type_change_part1.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations/0006_test_remove_onetoone_field_part1.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations/0002_test_unique_nullable_part1.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations/0001_initial.py'
+adding 'django-mssql-backend-2.8.1/testapp/migrations/0007_test_remove_onetoone_field_part2.py'
+adding 'django-mssql-backend-2.8.1/testapp/tests/test_expressions.py'
+adding 'django-mssql-backend-2.8.1/testapp/tests/__init__.py'
+adding 'django-mssql-backend-2.8.1/testapp/tests/test_constraints.py'
+adding 'django-mssql-backend-2.8.1/testapp/tests/test_fields.py'
+adding 'django-mssql-backend-2.8.1/django_mssql_backend.egg-info/PKG-INFO'
+adding 'django-mssql-backend-2.8.1/django_mssql_backend.egg-info/SOURCES.txt'
+adding 'django-mssql-backend-2.8.1/django_mssql_backend.egg-info/requires.txt'
+adding 'django-mssql-backend-2.8.1/django_mssql_backend.egg-info/top_level.txt'
+adding 'django-mssql-backend-2.8.1/django_mssql_backend.egg-info/dependency_links.txt'
+removing 'django-mssql-backend-2.8.1' (and everything under it)

.tox/dist/django-mssql-backend-2.8.1.zip

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.8
 
 ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
 

.tox/log/.lock

@@ -14,7 +14,7 @@ services:
       - db
 
   db:
-    image: "mcr.microsoft.com/mssql/server:2017-latest-ubuntu"
+    image: mcr.microsoft.com/mssql/server:2019-latest
     environment:
       ACCEPT_EULA: Y
       SA_PASSWORD: MyPassword42

.tox/log/GLOB-0.log

@@ -240,12 +240,15 @@ def alter_db_table(self, model, old_db_table, new_db_table):
 
         return super().alter_db_table(model, old_db_table, new_db_table)
 
-    def _delete_deferred_unique_indexes_for_field(self, field_name):
-        deferred_statements = self._deferred_unique_indexes.get(field_name, [])
+    def _delete_deferred_unique_indexes_for_field(self, field):
+        deferred_statements = self._deferred_unique_indexes.get(str(field), [])
         for stmt in deferred_statements:
             if stmt in self.deferred_sql:
                 self.deferred_sql.remove(stmt)
 
+    def _add_deferred_unique_index_for_field(self, field, statement):
+        self._deferred_unique_indexes[str(field)].append(statement)
+
     def _alter_field(self, model, old_field, new_field, old_type, new_type,
                      old_db_params, new_db_params, strict=False):
         """Actually perform a "physical" (non-ManyToMany) field update."""
@@ -660,7 +663,7 @@ def add_field(self, model, field):
                 model, [field], sql=self.sql_create_unique_null, suffix="_uniq"
             )
             self.deferred_sql.append(statement)
-            self._deferred_unique_indexes[field].append(statement)
+            self._add_deferred_unique_index_for_field(field, statement)
 
         # Check constraints can go on the column SQL here
         db_params = field.db_parameters(connection=self.connection)
@@ -768,7 +771,7 @@ def create_model(self, model):
                     model, [field], sql=self.sql_create_unique_null, suffix="_uniq"
                 )
                 self.deferred_sql.append(statement)
-                self._deferred_unique_indexes[field].append(statement)
+                self._add_deferred_unique_index_for_field(field, statement)
 
             # Check constraints can go on the column SQL here
             db_params = field.db_parameters(connection=self.connection)

docker/Dockerfile

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-       {py36,py37}-django22,
+       {py36,py37,py38}-django22,
        {py36,py37,py38}-django30,
 
 [testenv]
@@ -12,7 +12,7 @@ whitelist_externals =
     /bin/bash
 
 commands =
-    python manage.py test --keepdb
+    python manage.py test
     python manage.py install_regex_clr test_default
     bash test.sh