Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed pk uniqueness validation for new objects created outsid…

…e of a ModelForm. Also removed need for ModelForm to poke at Model._state.adding, keeping it an internal ORM concern.

Backport of r14613.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 87fe4be9c588856c872717cc714549c8f9c06956 1 parent d88cabd
@carljm carljm authored
View
2  django/db/models/base.py
@@ -263,7 +263,7 @@ def __init__(self, db=None):
# If true, uniqueness validation checks will consider this a new, as-yet-unsaved object.
# Necessary for correct validation of new instances of objects with explicit (non-auto) PKs.
# This impacts validation only; it has no effect on the actual save.
- self.adding = False
+ self.adding = True
class Model(object):
__metaclass__ = ModelBase
View
4 django/db/models/query.py
@@ -282,6 +282,8 @@ def iterator(self):
# Store the source database of the object
obj._state.db = self.db
+ # This object came from the database; it's not being added.
+ obj._state.adding = False
for i, k in enumerate(extra_select):
setattr(obj, k, row[i])
@@ -1220,6 +1222,7 @@ def get_cached_row(klass, row, index_start, using, max_depth=0, cur_depth=0,
# If an object was retrieved, set the database state.
if obj:
obj._state.db = using
+ obj._state.adding = False
index_end = index_start + field_count + offset
# Iterate over each related object, populating any
@@ -1475,6 +1478,7 @@ def transform_results(self, values):
setattr(instance, field, value)
instance._state.db = self.query.using
+ instance._state.adding = False
return instance
View
2  django/forms/models.py
@@ -244,10 +244,8 @@ def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
# if we didn't get an instance, instantiate a new one
self.instance = opts.model()
object_data = {}
- self.instance._state.adding = True
else:
self.instance = instance
- self.instance._state.adding = False
object_data = model_to_dict(instance, opts.fields, opts.exclude)
# if initial was provided, it should override the values from instance
if initial is not None:
View
2  tests/regressiontests/model_regress/models.py
@@ -58,6 +58,8 @@ def __unicode__(self):
# object).
return 'Názov: %s' % self.name
+class NonAutoPK(models.Model):
+ name = models.CharField(max_length=10, primary_key=True)
__test__ = {'API_TESTS': """
(NOTE: Part of the regression test here is merely parsing the model
View
16 tests/regressiontests/model_regress/tests.py
@@ -1,16 +1,26 @@
-from models import Worker
+from django.core.exceptions import ValidationError
from django.test import TestCase
+from models import Worker, NonAutoPK
+
+
class RelatedModelOrderedLookupTest(TestCase):
"""
Regression test for #10153: foreign key __gte and __lte lookups.
"""
-
+
# The bug is that the following queries would raise:
# "TypeError: Related Field has invalid lookup: gte"
-
+
def test_related_gte_lookup(self):
Worker.objects.filter(department__gte=0)
def test_related_lte_lookup(self):
Worker.objects.filter(department__lte=0)
+
+
+class ModelValidationTest(TestCase):
+ def test_pk_validation(self):
+ one = NonAutoPK.objects.create(name="one")
+ again = NonAutoPK(name="one")
+ self.assertRaises(ValidationError, again.validate_unique)
Please sign in to comment.
Something went wrong with that request. Please try again.