Commit bab9aab9 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #13941 -- Corrected the way sequence names are reset under Postgres,... 

Fixed #13941 -- Corrected the way sequence names are reset under Postgres, especially when generic foreign keys are involved. Thanks to Ales Zoulek for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent cd8758ef

django/db/backends/postgresql/operations.py

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ class DatabaseOperations(BaseDatabaseOperations): 
                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(f.m2m_db_table()),

                        style.SQL_FIELD('id'),

                        style.SQL_FIELD(qn('id')),

                        style.SQL_FIELD(qn('id')),

tests/regressiontests/backends/models.py

+15 −0
Original line number Diff line number Diff line 
from django.contrib.contenttypes import generic

from django.contrib.contenttypes.models import ContentType

from django.conf import settings

from django.db import models

from django.db import connection, DEFAULT_DB_ALIAS
@@ -37,6 +39,19 @@ if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] != 'django.db.backends.mysql': 
        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

+18 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import unittest 
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,6 +137,23 @@ if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] != 'django.db.backends.mysql': 
            for statement in connection.ops.sql_flush(no_style(), tables, sequences):

                cursor.execute(statement)



class SequenceResetTest(TestCase):

    def test_generic_relation(self):

        "Sequence names are correct when resetting generic relations (Ref #13941)"

        # Create an object with a manually specified PK

        models.Post.objects.create(id=10, name='1st post', text='hello world')



        # Reset the sequences for the database

        cursor = connection.cursor()

        commands = connections[DEFAULT_DB_ALIAS].ops.sequence_reset_sql(no_style(), [models.Post])

        for sql in commands:

            cursor.execute(sql)



        # If we create a new object now, it should have a PK greater

        # than the PK we specified manually.

        obj = models.Post.objects.create(name='New post', text='goodbye world')

        self.assertTrue(obj.pk > 10)





def connection_created_test(sender, **kwargs):

    print 'connection_created signal'