update for ease of consolidation of forks

Author: michiya

sql_server/pyodbc/base.py

@@ -1,10 +1,10 @@
 """
 MS SQL Server database backend for Django.
 """
-import sys
+import datetime
 import os
 import re
-import datetime
+import sys
 
 from django.core.exceptions import ImproperlyConfigured
 
@@ -26,8 +26,6 @@
 if DjangoVersion[:2] >= (1,5):
     _DJANGO_VERSION = 15
 elif DjangoVersion[:2] == (1,4):
-    # Django version 1.4 adds a backwards incompatible change to
-    # DatabaseOperations
     _DJANGO_VERSION = 14
 elif DjangoVersion[:2] == (1,3):
     _DJANGO_VERSION = 13
@@ -66,8 +64,8 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     #uses_savepoints = True
 
     def _supports_transactions(self):
-        # for Django 1.3/1.4 compatibility
-        return True
+        # keep it compatible with Django 1.3 and 1.4
+        return self.supports_transactions
 
 class DatabaseWrapper(BaseDatabaseWrapper):
     _DJANGO_VERSION = _DJANGO_VERSION
@@ -78,7 +76,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
     unicode_results = False
     datefirst = 7
     use_legacy_datetime = False
-    create_new_test_db = True
     connection_recovery_interval_msec = 0.0
 
     # Collations:       http://msdn2.microsoft.com/en-us/library/ms184391.aspx
@@ -153,12 +150,10 @@ def __init__(self, *args, **kwargs):
                 for op in self.operators:
                     sql = self.operators[op]
                     if sql.startswith('LIKE '):
-                        ops[op] = sql + ' COLLATE ' + self.collation
+                        ops[op] = '%s COLLATE %s' % (sql, self.collation)
                 self.operators.update(ops)
 
-        # setting mainly for running tests with Windows Azure SQL Database
-        # not to be charged too much for creating new databases in every test
-        self.create_new_test_db = self.settings_dict.get('TEST_CREATE', True)
+        self.test_create = self.settings_dict.get('TEST_CREATE', True)
 
         if _DJANGO_VERSION >= 13:
             self.features = DatabaseFeatures(self)
@@ -206,15 +201,20 @@ def _cursor(self):
                 else:
                     driver = 'FreeTDS'
 
+            # Microsoft driver names assumed here are:
+            # * SQL Server
+            # * SQL Native Client
+            # * SQL Server Native Client 10.0/11.0
+            # * ODBC Driver 11 for SQL Server
             ms_drivers = re.compile('.*SQL (Server$|(Server )?Native Client)')
             if 'dsn' in options:
                 cstr_parts.append('DSN=%s' % options['dsn'])
             else:
                 # Only append DRIVER if DATABASE_ODBC_DSN hasn't been set
                 cstr_parts.append('DRIVER={%s}' % driver)
 
-                if ms_drivers.match(driver) or driver == 'FreeTDS' \
-                        and options.get('host_is_server', False):
+                if ms_drivers.match(driver) or driver == 'FreeTDS' and \
+                        options.get('host_is_server', False):
                     if port_str:
                         host_str += ';PORT=%s' % port_str
                     cstr_parts.append('SERVER=%s' % host_str)
@@ -292,7 +292,7 @@ def _cursor(self):
 
         return CursorWrapper(cursor, self)
 
-    def _execute_on_tables(self, sql, table_names=None):
+    def _execute_foreach(self, sql, table_names=None):
         cursor = self.cursor()
         if not table_names:
             table_names = self.introspection.get_table_list(cursor)
@@ -312,12 +312,12 @@ def _on_error(self, e):
             time.sleep(self.connection_recovery_interval_msec)
 
     def check_constraints(self, table_names=None):
-        self._execute_on_tables('ALTER TABLE %s WITH CHECK CHECK CONSTRAINT ALL', table_names)
+        self._execute_foreach('ALTER TABLE %s WITH CHECK CHECK CONSTRAINT ALL', table_names)
 
     def disable_constraint_checking(self):
         # Windows Azure SQL Database doesn't support sp_msforeachtable
         #cursor.execute('EXEC sp_msforeachtable "ALTER TABLE ? NOCHECK CONSTRAINT ALL"')
-        self._execute_on_tables('ALTER TABLE %s NOCHECK CONSTRAINT ALL')
+        self._execute_foreach('ALTER TABLE %s NOCHECK CONSTRAINT ALL')
         return True
 
     def enable_constraint_checking(self):

sql_server/pyodbc/creation.py

@@ -1,7 +1,7 @@
 import base64
 import random
 
-from django.db.backends.creation import BaseDatabaseCreation, TEST_DATABASE_PREFIX
+from django.db.backends.creation import BaseDatabaseCreation
 
 from sql_server.pyodbc.compat import b, md5_constructor
 
@@ -63,18 +63,15 @@ def _create_test_db(self, verbosity, autoclobber):
             if settings_dict['TEST_NAME']:
                 test_name = settings_dict['TEST_NAME']
             else:
+                from django.db.backends.creation import TEST_DATABASE_PREFIX
                 test_name = TEST_DATABASE_PREFIX + settings_dict['NAME']
         if not settings_dict['TEST_NAME']:
             settings_dict['TEST_NAME'] = test_name
 
-        if not self.connection.create_new_test_db:
-            # clean an existing database for reuse in a test
+        if not self.connection.test_create:
+            # use the existing database instead of creating a new one
             if verbosity >= 1:
-                test_db_repr = ''
-                if verbosity >= 2:
-                    test_db_repr = " ('%s')" % test_name
-                print("Cleaning the existing database%s " \
-                      "instead of creating a new one..." % test_db_repr)
+                print("Dropping tables ... ")
 
             self.connection.close()
             settings_dict["NAME"] = test_name
@@ -87,6 +84,8 @@ def _create_test_db(self, verbosity, autoclobber):
                 objs = (qn(row[0]), qn(row[1]))
                 cursor.execute("ALTER TABLE %s DROP CONSTRAINT %s" % objs)
             for table in self.connection.introspection.get_table_list(cursor):
+                if verbosity >= 1:
+                    print("Dropping table %s" % table)
                 cursor.execute('DROP TABLE %s' % qn(table))
             self.connection.connection.commit()
             return test_name
@@ -99,7 +98,7 @@ def _create_test_db(self, verbosity, autoclobber):
 
     def _destroy_test_db(self, test_database_name, verbosity):
         "Internal implementation - remove the test db tables."
-        if self.connection.create_new_test_db:
+        if self.connection.test_create:
             if self.connection.ops.on_azure_sql_db:
                 self.connection.close()
                 self.connection.settings_dict["NAME"] = 'master'
@@ -117,7 +116,7 @@ def _destroy_test_db(self, test_database_name, verbosity):
                 test_db_repr = ''
                 if verbosity >= 2:
                     test_db_repr = " ('%s')" % test_database_name
-                print("skipped the destruction of the database%s." % test_db_repr)
+                print("The database is left undestroyed%s." % test_db_repr)
 
         self.connection.close()
 
@@ -126,7 +125,7 @@ def _prepare_for_test_db_ddl(self):
         self.connection.connection.autocommit = True
 
     def _rollback_works(self):
-        # for Django 1.2 compatibility
+        # keep it compatible with Django 1.2
         return self.connection.features.supports_transactions
 
     def sql_table_creation_suffix(self):

sql_server/pyodbc/operations.py

@@ -1,11 +1,13 @@
+import datetime
+import decimal
+import time
+
 from django.conf import settings
 from django.db.backends import BaseDatabaseOperations
 
 from sql_server.pyodbc.compat import smart_text, string_types, timezone
-import datetime
-import time
-import decimal
-import warnings
+
+EDITION_AZURE_SQL_DB = 5
 
 class DatabaseOperations(BaseDatabaseOperations):
     _aggregate_functions = (
@@ -24,10 +26,8 @@ class DatabaseOperations(BaseDatabaseOperations):
     def __init__(self, connection):
         if connection._DJANGO_VERSION >= 14:
             super(DatabaseOperations, self).__init__(connection)
-            self.supports_tz = True
         else:
             super(DatabaseOperations, self).__init__()
-            self.supports_tz = False
 
         self.connection = connection
         self._ss_ver = None
@@ -55,13 +55,12 @@ def _get_sql_server_ver(self):
     sql_server_ver = property(_get_sql_server_ver)
 
     def _on_azure_sql_db(self):
-        edition_azure_sql_db = 5
         if self._ss_edition is not None:
-            return self._ss_edition == edition_azure_sql_db
+            return self._ss_edition == EDITION_AZURE_SQL_DB
         cur = self.connection.cursor()
         cur.execute("SELECT CAST(SERVERPROPERTY('EngineEdition') as integer)")
         self._ss_edition = cur.fetchone()[0]
-        return self._ss_edition == edition_azure_sql_db
+        return self._ss_edition == EDITION_AZURE_SQL_DB
     on_azure_sql_db = property(_on_azure_sql_db)
 
     def bulk_batch_size(self, fields, objs):
@@ -289,9 +288,9 @@ def sql_flush(self, style, tables, sequences):
                              style.SQL_FIELD(self.quote_name(table)) ) for table in tables])
 
             if self.on_azure_sql_db:
-                warnings.warn("SQL for identity reset is not available " \
-                              "on Windows Azure SQL Database " \
-                              "(it doesn't support DBCC CHECKIDENT).",
+                import warnings
+                warnings.warn("The identity columns will never be reset " \
+                              "on Windows Azure SQL Database.",
                               RuntimeWarning)
             else:
                 # Then reset the counters on each table.
@@ -362,9 +361,9 @@ def value_to_db_datetime(self, value):
         """
         if value is None:
             return None
-        if self.supports_tz and settings.USE_TZ:
+        if self.connection._DJANGO_VERSION >= 14 and settings.USE_TZ:
             if timezone.is_aware(value):
-                # pyodbc donesn't support tz-aware datetimes
+                # pyodbc donesn't support datetimeoffset
                 value = value.astimezone(timezone.utc)
         if not self.connection.features.supports_microsecond_precision:
             value = value.replace(microsecond=0)