Ticket #5461: 5461.patch

test/utils.py

@@ -1 +1 @@
-import sys, time
-from django.conf import settings
-, get_creation_module
+
-from django.core import mail
-from django.core.management import call_command
-from django.dispatch import dispatcher
@@ -95 +95 @@
-    database already exists. Returns the name of the test database created.
-    """
-    # If the database backend wants to create the test DB itself, let it
-
-
-
+
+
-        return
-
-    if verbosity >= 1:
@@ -163 +162 @@
-
-def destroy_test_db(old_database_name, verbosity=1):
-    # If the database wants to drop the test DB itself, let it
-
-
-
+
+
-        return
-
-    # Unless we're using SQLite, remove the test database to clean up after

db/models/fields/__init__.py

@@ -6 +6 @@
-except ImportError:
-    from django.utils import _decimal as decimal    # for Python 2.3
-
-from django.db import get_creation_module
-from django.db.models import signals
-from django.dispatch import dispatcher
-from django.conf import settings
@@ -145 +144 @@
-        # mapped to one of the built-in Django field types. In this case, you
-        # can implement db_type() instead of get_internal_type() to specify
-        # exactly which wacky database column type you want to use.
-
+
+
-        internal_type = self.get_internal_type()
-        return data_types[internal_type] % self.__dict__
-

db/__init__.py

@@ -23 +23 @@
-    else:
-        raise # If there's some other error, this must be an error in Django itself.
-
-get_introspection_module = lambda: __import__('django.db.backends.%s.introspection' % settings.DATABASE_ENGINE, {}, {}, [''])
-get_creation_module = lambda: __import__('django.db.backends.%s.creation' % settings.DATABASE_ENGINE, {}, {}, [''])
-runshell = lambda: __import__('django.db.backends.%s.client' % settings.DATABASE_ENGINE, {}, {}, ['']).runshell()
-
-connection = backend.DatabaseWrapper(**settings.DATABASE_OPTIONS)
@@ -46 +44 @@
-def _rollback_on_exception():
-    from django.db import transaction
-    transaction.rollback_unless_managed()
-
+

db/backends/ado_mssql/introspection.py

@@ -1 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+

db/backends/ado_mssql/creation.py

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

db/backends/mysql_old/introspection.py

@@ +1 @@
+from django.db.backends.introspection import BaseIntrospection
-from django.db.backends.mysql_old.base import DatabaseOperations
-from MySQLdb import ProgrammingError, OperationalError
-from MySQLdb.constants import FIELD_TYPE
@@ -6 +7 @@
-quote_name = DatabaseOperations().quote_name
-foreign_key_re = re.compile(r"\sCONSTRAINT `[^`]*` FOREIGN KEY \(`([^`]*)`\) REFERENCES `([^`]*)` \(`([^`]*)`\)")
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-def get_table_description(cursor, table_name
-"Returns a description of the table, with the DB-API cursor.description interfac
-cursor.execute("SELECT * FROM %s LIMIT 1" % quote_name(table_name)
-return cursor.description
+    def get_table_list(self, cursor
+    "Returns a list of table names in the current databas
+    cursor.execute("SHOW TABLES"
+    return [row[0] for row in cursor.fetchall()]
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

db/backends/mysql_old/creation.py

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

db/backends/postgresql/introspection.py

@@ +1 @@
+from django.db.backends.introspection import BaseIntrospection
-from django.db.backends.postgresql.base import DatabaseOperations
-
-quote_name = DatabaseOperations().quote_name
@@ -2 +3 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

db/backends/postgresql/creation.py

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

db/backends/sqlite3/introspection.py

@@ +1 @@
+from django.db.backends.introspection import BaseIntrospection
-from django.db.backends.sqlite3.base import DatabaseOperations
-
-quote_name = DatabaseOperations().quote_name
@@ -2 +3 @@
-
-def get_table_list(cursor):
-    "Returns a list of table names in the current database."
-    # Skip the sqlite_sequence system table used for autoincrement key
-    # generation.
-    cursor.execute("""
-        SELECT name FROM sqlite_master
-        WHERE type='table' AND NOT name='sqlite_sequence'
-        ORDER BY name""")
-    return [row[0] for row in cursor.fetchall()]
-
-def get_table_description(cursor, table_name):
-    "Returns a description of the table, with the DB-API cursor.description interface."
-    return [(info['name'], info['type'], None, None, None, None,
-             info['null_ok']) for info in _table_info(cursor, table_name)]
-
-def get_relations(cursor, table_name):
-    raise NotImplementedError
-
-def get_indexes(cursor, table_name):
-    """
-    Returns a dictionary of fieldname -> infodict for the given table,
-    where each infodict is in the format:
-        {'primary_key': boolean representing whether it's the primary key,
-         'unique': boolean representing whether it's a unique index}
-    """
-    indexes = {}
-    for info in _table_info(cursor, table_name):
-        indexes[info['name']] = {'primary_key': info['pk'] != 0,
-                                 'unique': False}
-    cursor.execute('PRAGMA index_list(%s)' % quote_name(table_name))
-    # seq, name, unique
-    for index, unique in [(field[1], field[2]) for field in cursor.fetchall()]:
-        if not unique:
-            continue
-        cursor.execute('PRAGMA index_info(%s)' % quote_name(index))
-        info = cursor.fetchall()
-        # Skip indexes across multiple fields
-        if len(info) != 1:
-            continue
-        name = info[0][2] # seqno, cid, name
-        indexes[name]['unique'] = True
-    return indexes
-
-def _table_info(cursor, name):
-    cursor.execute('PRAGMA table_info(%s)' % quote_name(name))
-    # cid, name, type, notnull, dflt_value, pk
-    return [{'name': field[1],
-             'type': field[2],
-             'null_ok': not field[3],
-             'pk': field[5]     # undocumented
-             } for field in cursor.fetchall()]
-
-# Maps SQL types to Django Field types. Some of the SQL types have multiple
-# entries here because SQLite allows for anything and doesn't normalize the
-# field type; it uses whatever was given.
-BASE_DATA_TYPES_REVERSE = {
-    'bool': 'BooleanField',
-    'boolean': 'BooleanField',
-    'smallint': 'SmallIntegerField',
-    'smallinteger': 'SmallIntegerField',
-    'int': 'IntegerField',
-    'integer': 'IntegerField',
-    'text': 'TextField',
-    'char': 'CharField',
-    'date': 'DateField',
-    'datetime': 'DateTimeField',
-    'time': 'TimeField',
-}
-
-# This light wrapper "fakes" a dictionary interface, because some SQLite data
-# types include variables in them -- e.g. "varchar(30)" -- and can't be matched
-# as a simple dictionary lookup.
-class FlexibleFieldLookupDict:
+    base_data_types_reverse = {
+        'bool': 'BooleanField',
+        'boolean': 'BooleanField',
+        'smallint': 'SmallIntegerField',
+        'smallinteger': 'SmallIntegerField',
+        'int': 'IntegerField',
+        'integer': 'IntegerField',
+        'text': 'TextField',
+        'char': 'CharField',
+        'date': 'DateField',
+        'datetime': 'DateTimeField',
+        'time': 'TimeField',
+    }
+    
-    def __getitem__(self, key):
-        key = key.lower()
-        try:
-BASE_DATA_TYPES_REVERSE
+self.base_data_types_reverse
-        except KeyError:
@@ -86 +32 @@
-                return ('CharField', {'max_length': int(m.group(1))})
-            raise KeyError
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

db/backends/sqlite3/creation.py

@@ -1 +1 @@
-# SQLite doesn't actually support most of these types, but it "does the right
-# thing" given more verbose field definitions, so leave them as is so that
-# schema inspection is more useful.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

db/backends/mysql/introspection.py

@@ +1 @@
+from django.db.backends.introspection import BaseIntrospection
-from django.db.backends.mysql.base import DatabaseOperations
-from MySQLdb import ProgrammingError, OperationalError
-from MySQLdb.constants import FIELD_TYPE
@@ -6 +7 @@
-quote_name = DatabaseOperations().quote_name
-foreign_key_re = re.compile(r"\sCONSTRAINT `[^`]*` FOREIGN KEY \(`([^`]*)`\) REFERENCES `([^`]*)` \(`([^`]*)`\)")
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-def get_table_description(cursor, table_name
-"Returns a description of the table, with the DB-API cursor.description interfac
-cursor.execute("SELECT * FROM %s LIMIT 1" % quote_name(table_name)
-return cursor.description
+    def get_table_list(self, cursor
+    "Returns a list of table names in the current databas
+    cursor.execute("SHOW TABLES"
+    return [row[0] for row in cursor.fetchall()]
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+