From 8b3e1b6e9e4ee87fe85b2e5437faf59457e03e62 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Sat, 10 Aug 2019 02:41:18 -0400 Subject: [PATCH] Refs #11964 -- Made constraint support check respect required_db_features. This will notably silence the warnings issued when running the test suite on MySQL. --- django/db/models/base.py | 5 ++++- tests/constraints/models.py | 17 +++++++++++++-- tests/constraints/tests.py | 25 ++++++++++++----------- tests/introspection/models.py | 14 +++++++++++-- tests/introspection/tests.py | 22 ++++++++++++-------- tests/invalid_models_tests/test_models.py | 10 +++++++++ 6 files changed, 67 insertions(+), 26 deletions(-) diff --git a/django/db/models/base.py b/django/db/models/base.py index 18ee0b4911..91b4639524 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -1813,7 +1813,10 @@ class Model(metaclass=ModelBase): if not router.allow_migrate_model(db, cls): continue connection = connections[db] - if connection.features.supports_table_check_constraints: + if ( + connection.features.supports_table_check_constraints or + 'supports_table_check_constraints' in cls._meta.required_db_features + ): continue if any(isinstance(constraint, CheckConstraint) for constraint in cls._meta.constraints): errors.append( diff --git a/tests/constraints/models.py b/tests/constraints/models.py index fb6ef620f0..d207de6e73 100644 --- a/tests/constraints/models.py +++ b/tests/constraints/models.py @@ -2,12 +2,13 @@ from django.db import models class Product(models.Model): - name = models.CharField(max_length=255) - color = models.CharField(max_length=32, null=True) price = models.IntegerField(null=True) discounted_price = models.IntegerField(null=True) class Meta: + required_db_features = { + 'supports_table_check_constraints', + } constraints = [ models.CheckConstraint( check=models.Q(price__gt=models.F('discounted_price')), @@ -17,6 +18,15 @@ class Product(models.Model): check=models.Q(price__gt=0), name='%(app_label)s_%(class)s_price_gt_0', ), + ] + + +class UniqueConstraintProduct(models.Model): + name = models.CharField(max_length=255) + color = models.CharField(max_length=32, null=True) + + class Meta: + constraints = [ models.UniqueConstraint(fields=['name', 'color'], name='name_color_uniq'), models.UniqueConstraint( fields=['name'], @@ -31,6 +41,9 @@ class AbstractModel(models.Model): class Meta: abstract = True + required_db_features = { + 'supports_table_check_constraints', + } constraints = [ models.CheckConstraint( check=models.Q(age__gte=18), diff --git a/tests/constraints/tests.py b/tests/constraints/tests.py index 7ac478a89f..3b28c99e7f 100644 --- a/tests/constraints/tests.py +++ b/tests/constraints/tests.py @@ -3,7 +3,7 @@ from django.db import IntegrityError, connection, models from django.db.models.constraints import BaseConstraint from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature -from .models import ChildModel, Product +from .models import ChildModel, Product, UniqueConstraintProduct def get_constraints(table): @@ -69,9 +69,9 @@ class CheckConstraintTests(TestCase): @skipUnlessDBFeature('supports_table_check_constraints') def test_database_constraint(self): - Product.objects.create(name='Valid', price=10, discounted_price=5) + Product.objects.create(price=10, discounted_price=5) with self.assertRaises(IntegrityError): - Product.objects.create(name='Invalid', price=10, discounted_price=20) + Product.objects.create(price=10, discounted_price=20) @skipUnlessDBFeature('supports_table_check_constraints', 'can_introspect_check_constraints') def test_name(self): @@ -92,9 +92,9 @@ class CheckConstraintTests(TestCase): class UniqueConstraintTests(TestCase): @classmethod def setUpTestData(cls): - cls.p1, cls.p2 = Product.objects.bulk_create([ - Product(name='p1', color='red'), - Product(name='p2'), + cls.p1, cls.p2 = UniqueConstraintProduct.objects.bulk_create([ + UniqueConstraintProduct(name='p1', color='red'), + UniqueConstraintProduct(name='p2'), ]) def test_eq(self): @@ -177,19 +177,20 @@ class UniqueConstraintTests(TestCase): def test_database_constraint(self): with self.assertRaises(IntegrityError): - Product.objects.create(name=self.p1.name, color=self.p1.color) + UniqueConstraintProduct.objects.create(name=self.p1.name, color=self.p1.color) def test_model_validation(self): - with self.assertRaisesMessage(ValidationError, 'Product with this Name and Color already exists.'): - Product(name=self.p1.name, color=self.p1.color).validate_unique() + msg = 'Unique constraint product with this Name and Color already exists.' + with self.assertRaisesMessage(ValidationError, msg): + UniqueConstraintProduct(name=self.p1.name, color=self.p1.color).validate_unique() def test_model_validation_with_condition(self): """Partial unique constraints are ignored by Model.validate_unique().""" - Product(name=self.p1.name, color='blue').validate_unique() - Product(name=self.p2.name).validate_unique() + UniqueConstraintProduct(name=self.p1.name, color='blue').validate_unique() + UniqueConstraintProduct(name=self.p2.name).validate_unique() def test_name(self): - constraints = get_constraints(Product._meta.db_table) + constraints = get_constraints(UniqueConstraintProduct._meta.db_table) expected_name = 'name_color_uniq' self.assertIn(expected_name, constraints) diff --git a/tests/introspection/models.py b/tests/introspection/models.py index d069c5820e..6f43359dd4 100644 --- a/tests/introspection/models.py +++ b/tests/introspection/models.py @@ -70,14 +70,24 @@ class Comment(models.Model): article = models.ForeignKey(Article, models.CASCADE, db_index=True) email = models.EmailField() pub_date = models.DateTimeField() - up_votes = models.PositiveIntegerField() body = models.TextField() class Meta: constraints = [ - models.CheckConstraint(name='up_votes_gte_0_check', check=models.Q(up_votes__gte=0)), models.UniqueConstraint(fields=['article', 'email', 'pub_date'], name='article_email_pub_date_uniq'), ] indexes = [ models.Index(fields=['email', 'pub_date'], name='email_pub_date_idx'), ] + + +class CheckConstraintModel(models.Model): + up_votes = models.PositiveIntegerField() + + class Meta: + required_db_features = { + 'supports_table_check_constraints', + } + constraints = [ + models.CheckConstraint(name='up_votes_gte_0_check', check=models.Q(up_votes__gte=0)), + ] diff --git a/tests/introspection/tests.py b/tests/introspection/tests.py index 4a7ce11e7a..91b6ec732e 100644 --- a/tests/introspection/tests.py +++ b/tests/introspection/tests.py @@ -6,7 +6,8 @@ from django.db.utils import DatabaseError from django.test import TransactionTestCase, skipUnlessDBFeature from .models import ( - Article, ArticleReporter, City, Comment, Country, District, Reporter, + Article, ArticleReporter, CheckConstraintModel, City, Comment, Country, + District, Reporter, ) @@ -241,19 +242,22 @@ class IntrospectionTests(TransactionTestCase): self.assertEqual(details['check'], check) self.assertEqual(details['foreign_key'], foreign_key) - with connection.cursor() as cursor: - constraints = connection.introspection.get_constraints(cursor, Comment._meta.db_table) # Test custom constraints custom_constraints = { 'article_email_pub_date_uniq', 'email_pub_date_idx', } - if ( - connection.features.supports_column_check_constraints and - connection.features.can_introspect_check_constraints - ): - custom_constraints.add('up_votes_gte_0_check') - assertDetails(constraints['up_votes_gte_0_check'], ['up_votes'], check=True) + with connection.cursor() as cursor: + constraints = connection.introspection.get_constraints(cursor, Comment._meta.db_table) + if ( + connection.features.supports_column_check_constraints and + connection.features.can_introspect_check_constraints + ): + constraints.update( + connection.introspection.get_constraints(cursor, CheckConstraintModel._meta.db_table) + ) + custom_constraints.add('up_votes_gte_0_check') + assertDetails(constraints['up_votes_gte_0_check'], ['up_votes'], check=True) assertDetails(constraints['article_email_pub_date_uniq'], ['article_id', 'email', 'pub_date'], unique=True) assertDetails(constraints['email_pub_date_idx'], ['email', 'pub_date'], index=True) # Test field constraints diff --git a/tests/invalid_models_tests/test_models.py b/tests/invalid_models_tests/test_models.py index 18a59c407d..0f1d1e4dc3 100644 --- a/tests/invalid_models_tests/test_models.py +++ b/tests/invalid_models_tests/test_models.py @@ -1191,3 +1191,13 @@ class ConstraintsTests(SimpleTestCase): ) expected = [] if connection.features.supports_table_check_constraints else [warn, warn] self.assertCountEqual(errors, expected) + + def test_check_constraints_required_db_features(self): + class Model(models.Model): + age = models.IntegerField() + + class Meta: + required_db_features = {'supports_table_check_constraints'} + constraints = [models.CheckConstraint(check=models.Q(age__gte=18), name='is_adult')] + + self.assertEqual(Model.check(), [])