Changeset 4937

Timestamp:

04/05/07 21:25:58 (2 years ago)

Author:

russellm

Message:

Fixed #3790 -- Fixed a problem with sequence resetting during fixture loads when using Postgres. Thanks to Jon Ballard and scott@staplefish.com for the report, and to Zach Thompson for suggesting a solution.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (5 diffs)
• 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/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) (1 diff)
• django/trunk/django/db/backends/postgresql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/postgresql_psycopg2/base.py (modified) (1 diff)
• django/trunk/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/trunk/docs/django-admin.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/fixtures_regress (added)
• django/trunk/tests/regressiontests/fixtures_regress/fixtures (added)
• django/trunk/tests/regressiontests/fixtures_regress/fixtures/sequence.json (added)
• django/trunk/tests/regressiontests/fixtures_regress/__init__.py (added)
• django/trunk/tests/regressiontests/fixtures_regress/models.py (added)

django/trunk/AUTHORS

@@ -193 +193 @@
-    Tyson Tate <tyson@fallingbullets.com>
-    thebjorn <bp@datakortet.no>
+    Zach Thompson <zthompson47@gmail.com>
-    Tom Tobin
-    Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>

django/trunk/django/core/management.py

@@ -411 +411 @@
-
-def get_sql_sequence_reset(app):
-PostgreSQL 
+
-    from django.db import backend, models
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-get_sql_sequence_reset.args = APP_ARGS
-
@@ -1334 +1314 @@
-    from django.db.models import get_apps
-    from django.core import serializers
-
+, backend
-    from django.conf import settings
-    import sys
@@ -1340 +1320 @@
-    # Keep a count of the installed objects and fixtures
-    count = [0,0]
-
+
+
-    humanize = lambda dirname: dirname and "'%s'" % dirname or 'absolute path'
-
@@ -1402 +1383 @@
-                            for obj in objects:
-                                count[0] += 1
+                                models.add(obj.object.__class__)
-                                obj.save()
-                            label_found = True
@@ -1423 +1405 @@
-        if verbosity > 0:
-            print "Installed %d object(s) from %d fixture(s)" % tuple(count)
+        sequence_sql = backend.get_sql_sequence_reset(style, models)
+        if sequence_sql:
+            if verbosity > 1:
+                print "Resetting sequences"
+            for line in sequence_sql:
+                cursor.execute(line)
-    transaction.commit()
-    transaction.leave_transaction_management()

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

@@ -152 +152 @@
-                 )  for table in full_table_list]
-
+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

@@ -41 +41 @@
-get_drop_foreignkey_sql = complain
-get_sql_flush = complain
+get_sql_sequence_reset = complain
-
-OPERATOR_MAPPING = {}

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

@@ -216 +216 @@
-        return []
-
+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

@@ -218 +218 @@
-        return []
-
+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

@@ -135 +135 @@
-             )  for table in tables]
-
+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 = {

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

@@ -214 +214 @@
-        return []
-
+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:
+        for f in model._meta.fields:
+            if isinstance(f, models.AutoField):
+                output.append("%s setval('%s', (%s max(%s) %s %s));" % \
+                    (style.SQL_KEYWORD('SELECT'),
+                    style.SQL_FIELD('%s_%s_seq' % (model._meta.db_table, f.column)),
+                    style.SQL_KEYWORD('SELECT'),
+                    style.SQL_FIELD(quote_name(f.column)),
+                    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', (%s max(%s) %s %s));" % \
+                (style.SQL_KEYWORD('SELECT'),
+                style.SQL_FIELD('%s_id_seq' % f.m2m_db_table()),
+                style.SQL_KEYWORD('SELECT'),
+                style.SQL_FIELD(quote_name('id')),
+                style.SQL_KEYWORD('FROM'),
+                style.SQL_TABLE(f.m2m_db_table())))
+    return output
-        
-# Register these custom typecasts, because Django expects dates/times to be

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

@@ -170 +170 @@
-    else:
-        return []
+
+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:
+        for f in model._meta.fields:
+            if isinstance(f, models.AutoField):
+                output.append("%s setval('%s', (%s max(%s) %s %s));" % \
+                    (style.SQL_KEYWORD('SELECT'),
+                    style.SQL_FIELD('%s_%s_seq' % (model._meta.db_table, f.column)),
+                    style.SQL_KEYWORD('SELECT'),
+                    style.SQL_FIELD(quote_name(f.column)),
+                    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', (%s max(%s) %s %s));" % \
+                (style.SQL_KEYWORD('SELECT'),
+                style.SQL_FIELD('%s_id_seq' % f.m2m_db_table()),
+                style.SQL_KEYWORD('SELECT'),
+                style.SQL_FIELD(quote_name('id')),
+                style.SQL_KEYWORD('FROM'),
+                style.SQL_TABLE(f.m2m_db_table())))
+    return output
-        
-OPERATOR_MAPPING = {

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

@@ -171 +171 @@
-    return sql
-
+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:

django/trunk/docs/django-admin.txt

@@ -367 +367 @@
-----------------------------------------------
-
-PostgreSQL 
+
-appnames.
-