Changeset 5964

Timestamp:

08/19/07 19:21:10 (1 year ago)

Author:

adrian

Message:

Refactored get_sql_sequence_reset() to DatabaseOperations?.sequence_reset_sql(). Refs #5106

Files:

• django/trunk/django/core/management/commands/loaddata.py (modified) (2 diffs)
• django/trunk/django/core/management/commands/sqlsequencereset.py (modified) (1 diff)
• django/trunk/django/db/backends/ado_mssql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/dummy/base.py (modified) (1 diff)
• django/trunk/django/db/backends/__init__.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql_old/base.py (modified) (1 diff)
• django/trunk/django/db/backends/oracle/base.py (modified) (2 diffs)
• django/trunk/django/db/backends/postgresql/base.py (modified) (2 diffs)
• django/trunk/django/db/backends/postgresql_psycopg2/base.py (modified) (2 diffs)
• django/trunk/django/db/backends/sqlite3/base.py (modified) (1 diff)

django/trunk/django/core/management/commands/loaddata.py

@@ -16 +16 @@
-        from django.db.models import get_apps
-        from django.core import serializers
-, backend
+
-        from django.conf import settings
-
@@ -106 +106 @@
-
-        if count[0] > 0:
-backend.get_sql_sequence_reset
+connection.ops.sequence_reset_sql
-            if sequence_sql:
-                if verbosity > 1:

django/trunk/django/core/management/commands/sqlsequencereset.py

@@ -6 +6 @@
-
-    def handle_app(self, app, **options):
-backend
-backend.get_sql_sequence_reset
+connection
+connection.ops.sequence_reset_sql

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

@@ -110 +110 @@
-    return "ON %s" % quote_name(tablespace)
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."
-    # No sequence reset required
-    return []
-
-OPERATOR_MAPPING = {
-    'exact': '= %s',

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

@@ -45 +45 @@
-dictfetchall = complain
-get_start_transaction_sql = complain
-get_sql_sequence_reset = complain
-
-OPERATOR_MAPPING = {}

django/trunk/django/db/backends/__init__.py

@@ -151 +151 @@
-        """
-        raise NotImplementedError()
+
+    def sequence_reset_sql(self, style, model_list):
+        """
+        Returns a list of the SQL statements required to reset sequences for
+        the given models.
+
+        The `style` argument is a Style object as returned by either
+        color_style() or no_style() in django.core.management.color.
+        """
+        return [] # No sequence reset required by default.

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

@@ -192 +192 @@
-    return "BEGIN;"
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."
-    # No sequence reset required
-    return []
-
-OPERATOR_MAPPING = {
-    'exact': '= %s',

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

@@ -211 +211 @@
-    return "BEGIN;"
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."
-    # No sequence reset required
-    return []
-
-OPERATOR_MAPPING = {
-    'exact': '= %s',

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

@@ -96 +96 @@
-            return []
-
+    def sequence_reset_sql(self, style, model_list):
+        from django.db import models
+        output = []
+        query = _get_sequence_reset_sql()
+        for model in model_list:
+            for f in model._meta.fields:
+                if isinstance(f, models.AutoField):
+                    sequence_name = get_sequence_name(model._meta.db_table)
+                    output.append(query % {'sequence':sequence_name,
+                                           'table':model._meta.db_table})
+                    break # Only one AutoField is allowed per model, so don't bother continuing.
+            for f in model._meta.many_to_many:
+                sequence_name = get_sequence_name(f.m2m_db_table())
+                output.append(query % {'sequence':sequence_name,
+                                       'table':f.m2m_db_table()})
+        return output
+
-class DatabaseWrapper(BaseDatabaseWrapper):
-    ops = DatabaseOperations()
@@ -244 +261 @@
-    name_length = DatabaseOperations().max_name_length() - 3
-    return '%s_SQ' % util.truncate_name(table, name_length).upper()
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."
-    from django.db import models
-    output = []
-    query = _get_sequence_reset_sql()
-    for model in model_list:
-        for f in model._meta.fields:
-            if isinstance(f, models.AutoField):
-                sequence_name = get_sequence_name(model._meta.db_table)
-                output.append(query % {'sequence':sequence_name,
-                                       'table':model._meta.db_table})
-                break # Only one AutoField is allowed per model, so don't bother continuing.
-        for f in model._meta.many_to_many:
-            sequence_name = get_sequence_name(f.m2m_db_table())
-            output.append(query % {'sequence':sequence_name,
-                                   'table':f.m2m_db_table()})
-    return output
-
-def get_trigger_name(table):

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

@@ -125 +125 @@
-            return []
-
+    def sequence_reset_sql(self, style, model_list):
+        from django.db import models
+        output = []
+        for model in model_list:
+            # Use `coalesce` to set the sequence for each model to the max pk value if there are records,
+            # or 1 if there are none. Set the `is_called` property (the third argument to `setval`) to true
+            # if there are records (as the max pk value is already in use), otherwise set it to false.
+            for f in model._meta.fields:
+                if isinstance(f, models.AutoField):
+                    output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
+                        (style.SQL_KEYWORD('SELECT'),
+                        style.SQL_FIELD(quote_name('%s_%s_seq' % (model._meta.db_table, f.column))),
+                        style.SQL_FIELD(quote_name(f.column)),
+                        style.SQL_FIELD(quote_name(f.column)),
+                        style.SQL_KEYWORD('IS NOT'),
+                        style.SQL_KEYWORD('FROM'),
+                        style.SQL_TABLE(quote_name(model._meta.db_table))))
+                    break # Only one AutoField is allowed per model, so don't bother continuing.
+            for f in model._meta.many_to_many:
+                output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
+                    (style.SQL_KEYWORD('SELECT'),
+                    style.SQL_FIELD(quote_name('%s_id_seq' % f.m2m_db_table())),
+                    style.SQL_FIELD(quote_name('id')),
+                    style.SQL_FIELD(quote_name('id')),
+                    style.SQL_KEYWORD('IS NOT'),
+                    style.SQL_KEYWORD('FROM'),
+                    style.SQL_TABLE(f.m2m_db_table())))
+        return output
+
-class DatabaseWrapper(BaseDatabaseWrapper):
-    ops = DatabaseOperations()
@@ -186 +215 @@
-    return "BEGIN;"
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."
-    from django.db import models
-    output = []
-    for model in model_list:
-        # Use `coalesce` to set the sequence for each model to the max pk value if there are records,
-        # or 1 if there are none. Set the `is_called` property (the third argument to `setval`) to true
-        # if there are records (as the max pk value is already in use), otherwise set it to false.
-        for f in model._meta.fields:
-            if isinstance(f, models.AutoField):
-                output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
-                    (style.SQL_KEYWORD('SELECT'),
-                    style.SQL_FIELD(quote_name('%s_%s_seq' % (model._meta.db_table, f.column))),
-                    style.SQL_FIELD(quote_name(f.column)),
-                    style.SQL_FIELD(quote_name(f.column)),
-                    style.SQL_KEYWORD('IS NOT'),
-                    style.SQL_KEYWORD('FROM'),
-                    style.SQL_TABLE(quote_name(model._meta.db_table))))
-                break # Only one AutoField is allowed per model, so don't bother continuing.
-        for f in model._meta.many_to_many:
-            output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
-                (style.SQL_KEYWORD('SELECT'),
-                style.SQL_FIELD(quote_name('%s_id_seq' % f.m2m_db_table())),
-                style.SQL_FIELD(quote_name('id')),
-                style.SQL_FIELD(quote_name('id')),
-                style.SQL_KEYWORD('IS NOT'),
-                style.SQL_KEYWORD('FROM'),
-                style.SQL_TABLE(f.m2m_db_table())))
-    return output
-
-def typecast_string(s):
-    """

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

@@ -87 +87 @@
-            return []
-
+    def sequence_reset_sql(self, style, model_list):
+        from django.db import models
+        output = []
+        for model in model_list:
+            # Use `coalesce` to set the sequence for each model to the max pk value if there are records,
+            # or 1 if there are none. Set the `is_called` property (the third argument to `setval`) to true
+            # if there are records (as the max pk value is already in use), otherwise set it to false.
+            for f in model._meta.fields:
+                if isinstance(f, models.AutoField):
+                    output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
+                        (style.SQL_KEYWORD('SELECT'),
+                        style.SQL_FIELD(quote_name('%s_%s_seq' % (model._meta.db_table, f.column))),
+                        style.SQL_FIELD(quote_name(f.column)),
+                        style.SQL_FIELD(quote_name(f.column)),
+                        style.SQL_KEYWORD('IS NOT'),
+                        style.SQL_KEYWORD('FROM'),
+                        style.SQL_TABLE(quote_name(model._meta.db_table))))
+                    break # Only one AutoField is allowed per model, so don't bother continuing.
+            for f in model._meta.many_to_many:
+                output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
+                    (style.SQL_KEYWORD('SELECT'),
+                    style.SQL_FIELD(quote_name('%s_id_seq' % f.m2m_db_table())),
+                    style.SQL_FIELD(quote_name('id')),
+                    style.SQL_FIELD(quote_name('id')),
+                    style.SQL_KEYWORD('IS NOT'),
+                    style.SQL_KEYWORD('FROM'),
+                    style.SQL_TABLE(f.m2m_db_table())))
+        return output
+
-class DatabaseWrapper(BaseDatabaseWrapper):
-    ops = DatabaseOperations()
@@ -140 +169 @@
-    return "BEGIN;"
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."
-    from django.db import models
-    output = []
-    for model in model_list:
-        # Use `coalesce` to set the sequence for each model to the max pk value if there are records,
-        # or 1 if there are none. Set the `is_called` property (the third argument to `setval`) to true
-        # if there are records (as the max pk value is already in use), otherwise set it to false.
-        for f in model._meta.fields:
-            if isinstance(f, models.AutoField):
-                output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
-                    (style.SQL_KEYWORD('SELECT'),
-                    style.SQL_FIELD(quote_name('%s_%s_seq' % (model._meta.db_table, f.column))),
-                    style.SQL_FIELD(quote_name(f.column)),
-                    style.SQL_FIELD(quote_name(f.column)),
-                    style.SQL_KEYWORD('IS NOT'),
-                    style.SQL_KEYWORD('FROM'),
-                    style.SQL_TABLE(quote_name(model._meta.db_table))))
-                break # Only one AutoField is allowed per model, so don't bother continuing.
-        for f in model._meta.many_to_many:
-            output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
-                (style.SQL_KEYWORD('SELECT'),
-                style.SQL_FIELD(quote_name('%s_id_seq' % f.m2m_db_table())),
-                style.SQL_FIELD(quote_name('id')),
-                style.SQL_FIELD(quote_name('id')),
-                style.SQL_KEYWORD('IS NOT'),
-                style.SQL_KEYWORD('FROM'),
-                style.SQL_TABLE(f.m2m_db_table())))
-    return output
-
-OPERATOR_MAPPING = {
-    'exact': '= %s',

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

@@ -135 +135 @@
-    return "BEGIN;"
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."
-    # No sequence reset required
-    return []
-
-def _sqlite_date_trunc(lookup_type, dt):
-    try: