Ticket #12582: 12582.diff

django/db/models/fields/related.py

@@ -743 +743 @@
         super(ForeignKey, self).validate(value, model_instance)
         if not value:
             return
-        try:
-            self.rel.to._default_manager.get(**{self.rel.field_name:value})
-        except self.rel.to.DoesNotExist, e:
+
+        if not self.rel.to._default_manager.filter(**{self.rel.field_name:value}).complex_filter(self.rel.limit_choices_to).exists():
             raise exceptions.ValidationError(
                     self.error_messages['invalid'] % {'model': self.rel.to._meta.verbose_name, 'pk': value})
 

tests/modeltests/validation/models.py

@@ -12 +12 @@
     name = models.CharField(max_length=100)
     created = models.DateTimeField(default=datetime.now)
     number = models.IntegerField()
-    parent = models.ForeignKey('self', blank=True, null=True)
+    parent = models.ForeignKey('self', blank=True, null=True, limit_choices_to={'name__startswith': 'Some'})
     email = models.EmailField(blank=True)
     url = models.URLField(blank=True)
     f_with_custom_validator = models.IntegerField(blank=True, null=True, validators=[validate_answer_to_universe])

tests/modeltests/validation/tests.py

@@ -32 +32 @@
         mtv=ModelToValidate(number=10, name='Some Name', parent_id=parent.pk)
         self.assertEqual(None, mtv.full_validate())
 
+    def test_limitted_FK_raises_error(self):
+        parent = ModelToValidate.objects.create(number=10, name='Other Name')
+        mtv=ModelToValidate(number=10, name='Some Name', parent_id=parent.pk)
+        self.assertFailsValidation(mtv.full_validate, ['parent'])
+
     def test_wrong_email_value_raises_error(self):
         mtv = ModelToValidate(number=10, name='Some Name', email='not-an-email')
         self.assertFailsValidation(mtv.full_validate, ['email'])