innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #7565 -- Fixed a problem with PostgreSQL sequence resetting in loaddata. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-06-30 00:38:14 +00:00
parent f62e5a1fba
commit b0bc8b9dfd
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/backends/postgresql/operations.py
View File

@ -97,7 +97,7 @@ class DatabaseOperations(BaseDatabaseOperations):
# Use `coalesce` to set the sequence for each model to the max pk value if there are records, # 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 # 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. # if there are records (as the max pk value is already in use), otherwise set it to false.
for f in model._meta.fields: for f in model._meta.local_fields:
if isinstance(f, models.AutoField): if isinstance(f, models.AutoField):
output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \ output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
(style.SQL_KEYWORD('SELECT'), (style.SQL_KEYWORD('SELECT'),

4
tests/regressiontests/fixtures_regress/fixtures/model-inheritance.json Normal file
View File

@ -0,0 +1,4 @@
[
{"pk": 1, "model": "fixtures_regress.parent", "fields": {"name": "fred"}},
{"pk": 1, "model": "fixtures_regress.child", "fields": {"data": "apple"}}
]

21
tests/regressiontests/fixtures_regress/models.py
View File

@ -20,7 +20,7 @@ class Plant(models.Model):
class Stuff(models.Model): class Stuff(models.Model):
name = models.CharField(max_length=20, null=True) name = models.CharField(max_length=20, null=True)
owner = models.ForeignKey(User, null=True) owner = models.ForeignKey(User, null=True)
def __unicode__(self): def __unicode__(self):
# Oracle doesn't distinguish between None and the empty string. # Oracle doesn't distinguish between None and the empty string.
# This hack makes the test case pass using Oracle. # This hack makes the test case pass using Oracle.
@ -38,13 +38,19 @@ class Absolute(models.Model):
super(Absolute, self).__init__(*args, **kwargs) super(Absolute, self).__init__(*args, **kwargs)
Absolute.load_count += 1 Absolute.load_count += 1
class Parent(models.Model):
name = models.CharField(max_length=10)
class Child(Parent):
data = models.CharField(max_length=10)
__test__ = {'API_TESTS':""" __test__ = {'API_TESTS':"""
>>> from django.core import management >>> from django.core import management
# Load a fixture that uses PK=1 # Load a fixture that uses PK=1
>>> management.call_command('loaddata', 'sequence', verbosity=0) >>> management.call_command('loaddata', 'sequence', verbosity=0)
# Create a new animal. Without a sequence reset, this new object # Create a new animal. Without a sequence reset, this new object
# will take a PK of 1 (on Postgres), and the save will fail. # will take a PK of 1 (on Postgres), and the save will fail.
# This is a regression test for ticket #3790. # This is a regression test for ticket #3790.
@ -61,9 +67,9 @@ __test__ = {'API_TESTS':"""
[<Stuff: None is owned by None>] [<Stuff: None is owned by None>]
############################################### ###############################################
# Regression test for ticket #6436 -- # Regression test for ticket #6436 --
# os.path.join will throw away the initial parts of a path if it encounters # os.path.join will throw away the initial parts of a path if it encounters
# an absolute path. This means that if a fixture is specified as an absolute path, # an absolute path. This means that if a fixture is specified as an absolute path,
# we need to make sure we don't discover the absolute path in every fixture directory. # we need to make sure we don't discover the absolute path in every fixture directory.
>>> load_absolute_path = os.path.join(os.path.dirname(__file__), 'fixtures', 'absolute.json') >>> load_absolute_path = os.path.join(os.path.dirname(__file__), 'fixtures', 'absolute.json')
@ -94,4 +100,11 @@ No fixture data found for 'bad_fixture2'. (File format may be invalid.)
>>> sys.stderr = savestderr >>> sys.stderr = savestderr
###############################################
# Test for ticket #7565 -- PostgreSQL sequence resetting checks shouldn't
# ascend to parent models when inheritance is used (since they are treated
# individually).
>>> management.call_command('loaddata', 'model-inheritance.json', verbosity=0)
"""} """}