Changeset 5519

Timestamp:

06/23/07 09:16:00 (1 year ago)

Author:

mtredinnick

Message:

Merged boulder-oracle-sprint branch (r3965:5512) back into trunk. All
expected tests pass for all databases.

Files:

• django/trunk/django/contrib/admin/models.py (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (26 diffs)
• django/trunk/django/db/backends/ado_mssql/base.py (modified) (3 diffs)
• django/trunk/django/db/backends/dummy/base.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql/base.py (modified) (4 diffs)
• django/trunk/django/db/backends/mysql_old/base.py (modified) (4 diffs)
• django/trunk/django/db/backends/oracle/base.py (modified) (9 diffs)
• django/trunk/django/db/backends/oracle/client.py (modified) (1 diff)
• django/trunk/django/db/backends/oracle/creation.py (modified) (1 diff)
• django/trunk/django/db/backends/oracle/introspection.py (modified) (4 diffs)
• django/trunk/django/db/backends/postgresql/base.py (modified) (8 diffs)
• django/trunk/django/db/backends/postgresql_psycopg2/base.py (modified) (6 diffs)
• django/trunk/django/db/backends/sqlite3/base.py (modified) (4 diffs)
• django/trunk/django/db/backends/util.py (modified) (2 diffs)
• django/trunk/django/db/models/base.py (modified) (5 diffs)
• django/trunk/django/db/models/fields/__init__.py (modified) (7 diffs)
• django/trunk/django/db/models/fields/related.py (modified) (1 diff)
• django/trunk/django/db/models/options.py (modified) (5 diffs)
• django/trunk/django/db/models/query.py (modified) (12 diffs)
• django/trunk/django/newforms/widgets.py (modified) (1 diff)
• django/trunk/django/test/utils.py (modified) (3 diffs)
• django/trunk/docs/faq.txt (modified) (2 diffs)
• django/trunk/docs/install.txt (modified) (2 diffs)
• django/trunk/docs/model-api.txt (modified) (3 diffs)
• django/trunk/docs/settings.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/datatypes (copied) (copied from django/branches/boulder-oracle-sprint/tests/regressiontests/datatypes)
• django/trunk/tests/regressiontests/datatypes/__init__.py (copied) (copied from django/branches/boulder-oracle-sprint/tests/regressiontests/datatypes/__init__.py)
• django/trunk/tests/regressiontests/datatypes/models.py (copied) (copied from django/branches/boulder-oracle-sprint/tests/regressiontests/datatypes/models.py) (3 diffs)
• django/trunk/tests/regressiontests/serializers_regress/tests.py (modified) (5 diffs)

django/trunk/django/contrib/admin/models.py

@@ -10 +10 @@
-class LogEntryManager(models.Manager):
-    def log_action(self, user_id, content_type_id, object_id, object_repr, action_flag, change_message=''):
-object_id
+str(object_id)
-        e.save()
-

django/trunk/django/core/management.py

@@ -60 +60 @@
-def _get_installed_models(table_list):
-    "Gets a set of all models that are installed, given a list of existing tables"
-
+backend, 
-    all_models = []
-    for app in models.get_apps():
-        for model in models.get_models(app):
-            all_models.append(model)
-
+
+
+
+
+
-
-def _get_table_list():
@@ -101 +105 @@
-    "Returns a list of the CREATE TABLE SQL statements for the given app."
-    from django.db import get_creation_module, models
+
-    data_types = get_creation_module().DATA_TYPES
-
@@ -172 +177 @@
-            data_type = f.get_internal_type()
-        col_type = data_types[data_type]
+        tablespace = f.db_tablespace or opts.db_tablespace
-        if col_type is not None:
-            # Make the definition (e.g. 'foo VARCHAR(30)') for this field.
@@ -177 +183 @@
-                style.SQL_COLTYPE(col_type % rel_field.__dict__)]
-            field_output.append(style.SQL_KEYWORD('%sNULL' % (not f.null and 'NOT ' or '')))
-
+ and (not f.primary_key or backend.allows_unique_and_pk)
-                field_output.append(style.SQL_KEYWORD('UNIQUE'))
-            if f.primary_key:
-                field_output.append(style.SQL_KEYWORD('PRIMARY KEY'))
+            if tablespace and backend.supports_tablespaces and (f.unique or f.primary_key) and backend.autoindexes_primary_keys:
+                # We must specify the index tablespace inline, because we
+                # won't be generating a CREATE INDEX statement for this field.
+                field_output.append(backend.get_tablespace_sql(tablespace, inline=True))
-            if f.rel:
-                if f.rel.to in known_models:
@@ -204 +214 @@
-    for i, line in enumerate(table_output): # Combine and add commas.
-        full_statement.append('    %s%s' % (line, i < len(table_output)-1 and ',' or ''))
-
+
+
+
+
-    final_output.append('\n'.join(full_statement))
+
+    if opts.has_auto_field and hasattr(backend, 'get_autoinc_sql'):
+        # Add any extra SQL needed to support auto-incrementing primary keys
+        autoinc_sql = backend.get_autoinc_sql(opts.db_table)
+        if autoinc_sql:
+            for stmt in autoinc_sql:
+                final_output.append(stmt)
-
-    return final_output, pending_references
@@ -214 +234 @@
-    """
-    from django.db import backend, get_creation_module
+    from django.db.backends.util import truncate_name
-    data_types = get_creation_module().DATA_TYPES
-
@@ -230 +251 @@
-                r_name = '%s_refs_%s_%x' % (r_col, col, abs(hash((r_table, table))))
-                final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s;' % \
-r_name
+truncate_name(r_name, backend.get_max_name_length())
-                    backend.quote_name(r_col), backend.quote_name(table), backend.quote_name(col),
-                    backend.get_deferrable_sql()))
@@ -246 +267 @@
-    for f in opts.many_to_many:
-        if not isinstance(f.rel, generic.GenericRel):
+            tablespace = f.db_tablespace or opts.db_tablespace
+            if tablespace and backend.supports_tablespaces and backend.autoindexes_primary_keys:
+                tablespace_sql = ' ' + backend.get_tablespace_sql(tablespace, inline=True)
+            else:
+                tablespace_sql = ''
-            table_output = [style.SQL_KEYWORD('CREATE TABLE') + ' ' + \
-                style.SQL_TABLE(backend.quote_name(f.m2m_db_table())) + ' (']
-
+%s
-                (style.SQL_FIELD(backend.quote_name('id')),
-                style.SQL_COLTYPE(data_types['AutoField']),
-
+
+
-            table_output.append('    %s %s %s %s (%s)%s,' % \
-                (style.SQL_FIELD(backend.quote_name(f.m2m_column_name())),
@@ -266 +293 @@
-                style.SQL_FIELD(backend.quote_name(f.rel.to._meta.pk.column)),
-                backend.get_deferrable_sql()))
-
+%s
-                (style.SQL_KEYWORD('UNIQUE'),
-                style.SQL_FIELD(backend.quote_name(f.m2m_column_name())),
-
-
+
+
+
+
+
+
+
-            final_output.append('\n'.join(table_output))
+
+            # Add any extra SQL needed to support auto-incrementing PKs
+            autoinc_sql = backend.get_autoinc_sql(f.m2m_db_table())
+            if autoinc_sql:
+                for stmt in autoinc_sql:
+                    final_output.append(stmt)
+
-    return final_output
-
@@ -277 +316 @@
-    "Returns a list of the DROP TABLE SQL statements for the given app."
-    from django.db import backend, connection, models, get_introspection_module
+    from django.db.backends.util import truncate_name
-    introspection = get_introspection_module()
-
@@ -290 +330 @@
-    else:
-        table_names = []
+    if backend.uses_case_insensitive_names:
+        table_name_converter = str.upper
+    else:
+        table_name_converter = lambda x: x
-
-    output = []
@@ -299 +343 @@
-    app_models = models.get_models(app)
-    for model in app_models:
-model._meta.db_table
+table_name_converter(model._meta.db_table)
-            # The table exists, so it needs to be dropped
-            opts = model._meta
@@ -309 +353 @@
-
-    for model in app_models:
-model._meta.db_table
+table_name_converter(model._meta.db_table)
-            # Drop the table now
-            output.append('%s %s;' % (style.SQL_KEYWORD('DROP TABLE'),
@@ -319 +363 @@
-                    r_table = model._meta.db_table
-                    r_col = model._meta.get_field(f.rel.field_name).column
+                    r_name = '%s_refs_%s_%x' % (col, r_col, abs(hash((table, r_table))))
-                    output.append('%s %s %s %s;' % \
-                        (style.SQL_KEYWORD('ALTER TABLE'),
-                        style.SQL_TABLE(backend.quote_name(table)),
-                        style.SQL_KEYWORD(backend.get_drop_foreignkey_sql()),
-backend.quote_name('%s_refs_%s_%x' % (col, r_col, abs(hash((table, r_table)))
+truncate_name(r_name, backend.get_max_name_length(
-                del references_to_delete[model]
+            if model._meta.has_auto_field and hasattr(backend, 'get_drop_sequence'):
+                output.append(backend.get_drop_sequence(model._meta.db_table))
-
-    # Output DROP TABLE statements for many-to-many tables.
@@ -330 +377 @@
-        opts = model._meta
-        for f in opts.many_to_many:
-f.m2m_db_table(
+table_name_converter(f.m2m_db_table()
-                output.append("%s %s;" % (style.SQL_KEYWORD('DROP TABLE'),
-                    style.SQL_TABLE(backend.quote_name(f.m2m_db_table()))))
+                if hasattr(backend, 'get_drop_sequence'):
+                    output.append(backend.get_drop_sequence("%s_%s" % (model._meta.db_table, f.column)))
+
-
-    app_label = app_models[0]._meta.app_label
@@ -431 +481 @@
-
-    for f in model._meta.fields:
-
+ and not ((f.primary_key or f.unique) and backend.autoindexes_primary_keys)
-            unique = f.unique and 'UNIQUE ' or ''
+            tablespace = f.db_tablespace or model._meta.db_tablespace
+            if tablespace and backend.supports_tablespaces:
+                tablespace_sql = ' ' + backend.get_tablespace_sql(tablespace)
+            else:
+                tablespace_sql = ''
-            output.append(
-                style.SQL_KEYWORD('CREATE %sINDEX' % unique) + ' ' + \
@@ -438 +493 @@
-                style.SQL_KEYWORD('ON') + ' ' + \
-                style.SQL_TABLE(backend.quote_name(model._meta.db_table)) + ' ' + \
-
+
+
-            )
-    return output
@@ -462 +518 @@
-def syncdb(verbosity=1, interactive=True):
-    "Creates the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
-
+backend, 
-    from django.conf import settings
-
@@ -485 +541 @@
-    # so we know what needs to be added.
-    table_list = _get_table_list()
+    if backend.uses_case_insensitive_names:
+        table_name_converter = str.upper
+    else:
+        table_name_converter = lambda x: x
-
-    # Get a list of already installed *models* so that references work right.
@@ -499 +559 @@
-            if verbosity >= 2:
-                print "Processing %s.%s model" % (app_name, model._meta.object_name)
-model._meta.db_table
+table_name_converter(model._meta.db_table)
-                continue
-            sql, references = _get_sql_model_create(model, seen_models)
@@ -511 +571 @@
-            for statement in sql:
-                cursor.execute(statement)
-model._meta.db_table
+table_name_converter(model._meta.db_table)
-
-    # Create the m2m tables. This must be done after all tables have been created
@@ -830 +890 @@
-            indexes = {}
-        for i, row in enumerate(introspection_module.get_table_description(cursor, table_name)):
-
+.lower()
-            comment_notes = [] # Holds Field notes, to be displayed in a Python comment.
-            extra_params = {}  # Holds Field parameters such as 'db_column'.
@@ -1323 +1383 @@
-    count = [0,0]
-    models = set()
-
+
-    humanize = lambda dirname: dirname and "'%s'" % dirname or 'absolute path'
-
@@ -1401 +1461 @@
-                        print "No %s fixture '%s' in %s." % \
-                            (format, fixture_name, humanize(fixture_dir))
-
+
-    if count[0] > 0:
-        sequence_sql = backend.get_sql_sequence_reset(style, models)
@@ -1409 +1469 @@
-            for line in sequence_sql:
-                cursor.execute(line)
-
+
-    transaction.commit()
-    transaction.leave_transaction_management()
-
+
-    if count[0] == 0:
-        if verbosity > 0:
@@ -1627 +1687 @@
-            parser.print_usage_and_exit()
-        if action not in NO_SQL_TRANSACTION:
-
+
+
+
-        for mod in mod_list:
-            if action == 'reset':

django/trunk/django/db/backends/ado_mssql/base.py

@@ -90 +90 @@
-            self.connection = None
-
+allows_group_by_ordinal = True
+allows_unique_and_pk = True
+autoindexes_primary_keys = True
+needs_datetime_string_cast = True
+needs_upper_for_iops = False
-supports_constraints = True
+supports_tablespaces = True
+uses_case_insensitive_names = False
-
-def quote_name(name):
@@ -118 +125 @@
-        return "Convert(datetime, Convert(varchar(12), %s))" % field_name
-
+def get_datetime_cast_sql():
+    return None
+
-def get_limit_offset_sql(limit, offset=None):
-    # TODO: This is a guess. Make sure this is correct.
@@ -139 +149 @@
-def get_pk_default_value():
-    return "DEFAULT"
+
+def get_max_name_length():
+    return None
+
+def get_start_transaction_sql():
+    return "BEGIN;"
+
+def get_tablespace_sql(tablespace, inline=False):
+    return "ON %s" % quote_name(tablespace)
+
+def get_autoinc_sql(table):
+    return None
-
-def get_sql_flush(style, tables, sequences):

django/trunk/django/db/backends/dummy/base.py

@@ -34 +34 @@
-
-supports_constraints = False
+supports_tablespaces = False
-quote_name = complain
-dictfetchone = complain

django/trunk/django/db/backends/mysql/base.py

@@ -135 +135 @@
-        return self.server_version
-
+allows_group_by_ordinal = True
+allows_unique_and_pk = True
+autoindexes_primary_keys = False
+needs_datetime_string_cast = True     # MySQLdb requires a typecast for dates
+needs_upper_for_iops = False
-supports_constraints = True
+supports_tablespaces = False
+uses_case_insensitive_names = False
-
-def quote_name(name):
@@ -168 +175 @@
-    return sql
-
+def get_datetime_cast_sql():
+    return None
+
-def get_limit_offset_sql(limit, offset=None):
-    sql = "LIMIT "
@@ -189 +199 @@
-    return "DEFAULT"
-
+def get_max_name_length():
+    return None;
+
+def get_start_transaction_sql():
+    return "BEGIN;"
+
+def get_autoinc_sql(table):
+    return None
+
-def get_sql_flush(style, tables, sequences):
-    """Return a list of SQL statements required to remove all data from
-    all tables in the database (without actually removing the tables
-    themselves) and put the database in an empty 'initial' state
-
+
-    """
-    # NB: The generated SQL below is specific to MySQL
@@ -205 +224 @@
-                )  for table in tables] + \
-              ['SET FOREIGN_KEY_CHECKS = 1;']
-
+
-        # 'ALTER TABLE table AUTO_INCREMENT = 1;'... style SQL statements
-        # to reset sequence indices

django/trunk/django/db/backends/mysql_old/base.py

@@ -136 +136 @@
-        return self.server_version
-
+allows_group_by_ordinal = True
+allows_unique_and_pk = True
+autoindexes_primary_keys = False
+needs_datetime_string_cast = True     # MySQLdb requires a typecast for dates
+needs_upper_for_iops = False
-supports_constraints = True
+supports_tablespaces = False
+uses_case_insensitive_names = False
-
-def quote_name(name):
@@ -169 +176 @@
-    return sql
-
+def get_datetime_cast_sql():
+    return None
+
-def get_limit_offset_sql(limit, offset=None):
-    sql = "LIMIT "
@@ -190 +200 @@
-    return "DEFAULT"
-
+def get_max_name_length():
+    return None;
+
+def get_start_transaction_sql():
+    return "BEGIN;"
+
+def get_autoinc_sql(table):
+    return None
+
-def get_sql_flush(style, tables, sequences):
-    """Return a list of SQL statements required to remove all data from
-    all tables in the database (without actually removing the tables
-    themselves) and put the database in an empty 'initial' state
-
+
-    """
-    # NB: The generated SQL below is specific to MySQL
@@ -206 +225 @@
-                )  for table in tables] + \
-              ['SET FOREIGN_KEY_CHECKS = 1;']
-
+
-        # 'ALTER TABLE table AUTO_INCREMENT = 1;'... style SQL statements
-        # to reset sequence indices

django/trunk/django/db/backends/oracle/base.py

@@ -5 +5 @@
-"""
-
+from django.conf import settings
-from django.db.backends import util
-try:
@@ -11 +12 @@
-    from django.core.exceptions import ImproperlyConfigured
-    raise ImproperlyConfigured, "Error loading cx_Oracle module: %s" % e
+import datetime
+from django.utils.datastructures import SortedDict
+
-
-DatabaseError = Database.Error
@@ -32 +36 @@
-
-    def cursor(self):
-        from django.conf import settings
-        if not self._valid_connection():
-            if len(settings.DATABASE_HOST.strip()) == 0:
@@ -42 +45 @@
-                conn_string = "%s/%s@%s" % (settings.DATABASE_USER, settings.DATABASE_PASSWORD, settings.DATABASE_NAME)
-                self.connection = Database.connect(conn_string, **self.options)
-
+
+
+
+
+
+
+
+
+
-
-    def _commit(self):
-        if self.connection is not None:
-
+return 
-
-    def _rollback(self):
-        if self.connection is not None:
-
-
-
-
+
-
-    def close(self):
@@ -60 +68 @@
-            self.connection = None
-
+allows_group_by_ordinal = False
+allows_unique_and_pk = False        # Suppress UNIQUE/PK for Oracle (ORA-02259)
+autoindexes_primary_keys = True
+needs_datetime_string_cast = False
+needs_upper_for_iops = True
-supports_constraints = True
+supports_tablespaces = True
+uses_case_insensitive_names = True
-
-class FormatStylePlaceholderCursor(Database.Cursor):
@@ -68 +83 @@
-    you'll need to use "%%s".
-    """
+    def _rewrite_args(self, query, params=None):
+        if params is None:
+            params = []
+        else:
+            # cx_Oracle can't handle unicode parameters, so cast to str for now
+            for i, param in enumerate(params):
+                if type(param) == unicode:
+                    try:
+                        params[i] = param.encode('utf-8')
+                    except UnicodeError:
+                        params[i] = str(param)
+        args = [(':arg%d' % i) for i in range(len(params))]
+        query = query % tuple(args)
+        # cx_Oracle wants no trailing ';' for SQL statements.  For PL/SQL, it
+        # it does want a trailing ';' but not a trailing '/'.  However, these
+        # characters must be included in the original query in case the query
+        # is being passed to SQL*Plus.
+        if query.endswith(';') or query.endswith('/'):
+            query = query[:-1]
+        return query, params
+
-    def execute(self, query, params=None):
-
-
+
-        return Database.Cursor.execute(self, query, params)
-
-    def executemany(self, query, params=None):
-
-
+
-        return Database.Cursor.executemany(self, query, params)
-
-    def convert_arguments(self, query, num_params):
-        # replace occurances of "%s" with ":arg" - Oracle requires colons for parameter placeholders.
-        args = [':arg' for i in range(num_params)]
-        return query % tuple(args)
-
-def quote_name(name):
-
+
+
+
+
+
+
+
-
-dictfetchone = util.dictfetchone
@@ -91 +126 @@
-
-def get_last_insert_id(cursor, table_name, pk_name):
-query = "SELECT %s_sq.currval from dual" % table_name
-query
+sq_name = util.truncate_name(table_name, get_max_name_length()-3)
+'SELECT %s_sq.currval FROM dual' % sq_name
-    return cursor.fetchone()[0]
-
-def get_date_extract_sql(lookup_type, table_name):
-    # lookup_type is 'year', 'month', 'day'
-www.psoug.org/reference/date_func.html
+download-east.oracle.com/docs/cd/B10501_01/server.920/a96540/functions42a.htm#1017163
-    return "EXTRACT(%s FROM %s)" % (lookup_type, table_name)
-
-def get_date_trunc_sql(lookup_type, field_name):
-
+
+
+
+
+
+
+
+
+
+
+
-
-def get_limit_offset_sql(limit, offset=None):
-    # Limits and offset are too complicated to be handled here.
-
-pass
+backends/oracle/
+return ""
-
-def get_random_function_sql():
@@ -118 +163 @@
-
-def get_drop_foreignkey_sql():
-FOREIGN KEY
+CONSTRAINT
-
-def get_pk_default_value():
-    return "DEFAULT"
+
+def get_max_name_length():
+    return 30
+
+def get_start_transaction_sql():
+    return None
+
+def get_tablespace_sql(tablespace, inline=False):
+    return "%sTABLESPACE %s" % ((inline and "USING INDEX " or ""), quote_name(tablespace))
+
+def get_autoinc_sql(table):
+    # To simulate auto-incrementing primary keys in Oracle, we have to
+    # create a sequence and a trigger.
+    sq_name = get_sequence_name(table)
+    tr_name = get_trigger_name(table)
+    sequence_sql = 'CREATE SEQUENCE %s;' % sq_name
+    trigger_sql = """CREATE OR REPLACE TRIGGER %s
+  BEFORE INSERT ON %s
+  FOR EACH ROW
+  WHEN (new.id IS NULL)
+    BEGIN
+      SELECT %s.nextval INTO :new.id FROM dual;
+    END;
+    /""" % (tr_name, quote_name(table), sq_name)
+    return sequence_sql, trigger_sql
+
+def get_drop_sequence(table):
+    return "DROP SEQUENCE %s;" % quote_name(get_sequence_name(table))
+
+def _get_sequence_reset_sql():
+    # TODO: colorize this SQL code with style.SQL_KEYWORD(), etc.
+    return """
+        DECLARE
+            startvalue integer;
+            cval integer;
+        BEGIN
+            LOCK TABLE %(table)s IN SHARE MODE;
+            SELECT NVL(MAX(id), 0) INTO startvalue FROM %(table)s;
+            SELECT %(sequence)s.nextval INTO cval FROM dual;
+            cval := startvalue - cval;
+            IF cval != 0 THEN
+                EXECUTE IMMEDIATE 'ALTER SEQUENCE %(sequence)s MINVALUE 0 INCREMENT BY '||cval;
+                SELECT %(sequence)s.nextval INTO cval FROM dual;
+                EXECUTE IMMEDIATE 'ALTER SEQUENCE %(sequence)s INCREMENT BY 1';
+            END IF;
+            COMMIT;
+        END;
+        /"""
-
-def get_sql_flush(style, tables, sequences):
@@ -128 +221 @@
-    themselves) and put the database in an empty 'initial' state
-    """
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+