From 30e3d2d78df01d5e89e8a9491f5f061dda239fe5 Mon Sep 17 00:00:00 2001 From: Hannes Ljungberg Date: Mon, 29 Jun 2020 06:41:23 +0200 Subject: [PATCH] Fixed #31745 -- Added error messages when using UniqueConstraint.include/opclasses with deferrable. --- django/db/models/constraints.py | 8 ++++++++ tests/constraints/tests.py | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/django/db/models/constraints.py b/django/db/models/constraints.py index c6dd39e762..fd01ec5a11 100644 --- a/django/db/models/constraints.py +++ b/django/db/models/constraints.py @@ -95,6 +95,14 @@ class UniqueConstraint(BaseConstraint): raise ValueError( 'UniqueConstraint with conditions cannot be deferred.' ) + if include and deferrable: + raise ValueError( + 'UniqueConstraint with include fields cannot be deferred.' + ) + if opclasses and deferrable: + raise ValueError( + 'UniqueConstraint with opclasses cannot be deferred.' + ) if not isinstance(deferrable, (type(None), Deferrable)): raise ValueError( 'UniqueConstraint.deferrable must be a Deferrable instance.' diff --git a/tests/constraints/tests.py b/tests/constraints/tests.py index 4ec1f2a8e8..d9e91bdf49 100644 --- a/tests/constraints/tests.py +++ b/tests/constraints/tests.py @@ -406,6 +406,26 @@ class UniqueConstraintTests(TestCase): deferrable=models.Deferrable.DEFERRED, ) + def test_deferrable_with_include(self): + message = 'UniqueConstraint with include fields cannot be deferred.' + with self.assertRaisesMessage(ValueError, message): + models.UniqueConstraint( + fields=['name'], + name='name_inc_color_color_unique', + include=['color'], + deferrable=models.Deferrable.DEFERRED, + ) + + def test_deferrable_with_opclasses(self): + message = 'UniqueConstraint with opclasses cannot be deferred.' + with self.assertRaisesMessage(ValueError, message): + models.UniqueConstraint( + fields=['name'], + name='name_text_pattern_ops_unique', + opclasses=['text_pattern_ops'], + deferrable=models.Deferrable.DEFERRED, + ) + def test_invalid_defer_argument(self): message = 'UniqueConstraint.deferrable must be a Deferrable instance.' with self.assertRaisesMessage(ValueError, message):