Ticket #13941: 13941.patch

django/db/backends/postgresql/operations.py

@@ -132 +132 @@
                 if not f.rel.through:
                     output.append("%s setval(pg_get_serial_sequence('%s','%s'), coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
                         (style.SQL_KEYWORD('SELECT'),
-                        style.SQL_TABLE(model._meta.db_table),
+                        style.SQL_TABLE(qn(f.m2m_db_table())),
                         style.SQL_FIELD('id'),
                         style.SQL_FIELD(qn('id')),
                         style.SQL_FIELD(qn('id')),

tests/regressiontests/backends/models.py

@@ -2 +2 @@
 from django.db import models
 from django.db import connection, DEFAULT_DB_ALIAS
 
+from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.models import ContentType
+
+
 
 class Square(models.Model):
     root = models.IntegerField()
@@ -37 +41 @@
         m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.ManyToManyField(Person,blank=True)
 
 
+class Tag(models.Model):
+    name = models.CharField(max_length=30)
+    content_type = models.ForeignKey(ContentType)
+    object_id = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+
+
+class Post(models.Model):
+    name = models.CharField(max_length=30)
+    text = models.TextField()
+    tags = generic.GenericRelation('Tag')
+
+
 qn = connection.ops.quote_name
 
 __test__ = {'API_TESTS': """

tests/regressiontests/backends/tests.py

@@ -6 +6 @@
 from django.conf import settings
 from django.core import management
 from django.core.management.color import no_style
-from django.db import backend, connection, DEFAULT_DB_ALIAS
+from django.db import backend, connection, connections, DEFAULT_DB_ALIAS
 from django.db.backends.signals import connection_created
 from django.test import TestCase
 
@@ -137 +137 @@
             for statement in connection.ops.sql_flush(no_style(), tables, sequences):
                 cursor.execute(statement)
 
+if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] == 'django.db.backends.postgresql_psycopg2':
+    class PostgresResetSequenceTest(TestCase):
+
+        def test_generic_relation(self):
+            cursor = connection.cursor()
+            models.Post.objects.create(id=10, name='1st post', text='hello world')
+            commands = connections[DEFAULT_DB_ALIAS].ops.sequence_reset_sql(no_style(), [models.Post])
+            for sql in commands:
+                cursor.execute(sql)
+            cursor.execute("SELECT nextval(pg_get_serial_sequence('backends_post','id'))")
+            self.assertEqual(cursor.fetchone()[0], 11)
+
+
+
 
 def connection_created_test(sender, **kwargs):
     print 'connection_created signal'