  from .models import (Place, Restaurant, ItalianRestaurant, ParkingLot,
      ParkingLot2, ParkingLot3, Supplier, Wholesaler, Child, SelfRefParent,
      SelfRefChild, ArticleWithAuthor, M2MChild, QualityControl, DerivedM,
      Person, BirthdayParty, BachelorParty, MessyBachelorParty,
      InternalCertificationAudit, BusStation, TrainStation)
  
  
  class ModelInheritanceTest(TestCase):
      def test_model_inheritance(self):
          # Regression for #7350, #7202
 
</s> remove             if not self._state.adding and self.pk is not None:
                qs = qs.exclude(pk=self.pk)

 </s> add             # Note that we need to use the pk as defined by model_class, not
            # self.pk. These can be different fields because model inheritance
            # allows single model to have effectively multiple primary keys.
            # Refs #17615.
            model_class_pk = self._get_pk_val(model_class._meta)
            if not self._state.adding and model_class_pk is not None:
                qs = qs.exclude(pk=model_class_pk)
    InternalCertificationAudit, BusStation, TrainStation, User, Profile)
  from .models import (Place, Restaurant, ItalianRestaurant, ParkingLot,
      ParkingLot2, ParkingLot3, Supplier, Wholesaler, Child, SelfRefParent,
      SelfRefChild, ArticleWithAuthor, M2MChild, QualityControl, DerivedM,
      Person, BirthdayParty, BachelorParty, MessyBachelorParty,
    InternalCertificationAudit, BusStation, TrainStation, User, Profile)
  
  
  class ModelInheritanceTest(TestCase):
      def test_model_inheritance(self):
          # Regression for #7350, #7202
keep keep keep keep replace keep keep keep keep keep
 Fixed #17615 -- Corrected unique field validation when using multitable inheritance. The validation used wrong pk value if the parent and child model had different pk fields. Thanks ungenio for the report and patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17920 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
tests/regressiontests/model_inheritance_regress/tests.py