Commit 87fe4be9 authored by Carl Meyer's avatar Carl Meyer
Browse files

[1.2.X] Fixed pk uniqueness validation for new objects created outside of a... 

[1.2.X] Fixed pk uniqueness validation for new objects created outside 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
parent d88cabd3

django/db/models/base.py

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ class ModelState(object): 
        # 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

django/db/models/query.py

+4 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ class QuerySet(object): 


                # 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 @@ class RawQuerySet(object): 
            setattr(instance, field, value)



        instance._state.db = self.query.using

        instance._state.adding = False



        return instance

django/forms/models.py

+0 −2
Original line number Diff line number Diff line
@@ -244,10 +244,8 @@ class BaseModelForm(BaseForm): 
            # 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:

tests/regressiontests/model_regress/models.py

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ class BrokenUnicodeMethod(models.Model): 
        # 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

tests/regressiontests/model_regress/tests.py

+13 −3
Original line number Diff line number Diff line 
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.
@@ -14,3 +17,10 @@ class RelatedModelOrderedLookupTest(TestCase): 


    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)