Merge pull request #12 from jackton1/develop

Added support for generating the model name.

Author: jackton1

check_constraint/models.py

@@ -1,3 +1,5 @@
+import django
+from django.apps import apps
 from django.db import models
 
 from django.db.models.sql import Query
@@ -6,10 +8,21 @@
 
 
 class AnnotatedCheckConstraint(models.CheckConstraint):
-    def __init__(self, *args, annotations=None, **kwargs):
+    def __init__(self, *args, model=None, annotations=None, **kwargs):
+        self._model = model
         self.annotations = annotations or {}
         super(AnnotatedCheckConstraint, self).__init__(*args, **kwargs)
 
+    @property
+    def model(self):
+        if self._model:
+            return apps.get_model(self._model)
+        return self._model
+
+    @model.setter
+    def model(self, new_model):
+        self._model = new_model
+
     def _get_check_sql(self, model, schema_editor):
         query = Query(model=model)
 
@@ -27,6 +40,14 @@ def _get_check_sql(self, model, schema_editor):
 
     def deconstruct(self):
         path, args, kwargs = super(models.CheckConstraint, self).deconstruct()
+
+        if (2, 0) <= django.VERSION <= (3, 0) and self.model:
+            # noinspection PyProtectedMember
+            kwargs["name"] = kwargs["name"] % {
+                "app_label": self.model._meta.app_label.lower(),
+                "class": self.model.__name__.lower(),
+            }
+
         kwargs["check"] = self.check
         kwargs["annotations"] = self.annotations
 

check_constraint/tests.py

@@ -1,29 +1,51 @@
 from decimal import Decimal
+from unittest.mock import patch, PropertyMock
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.db import IntegrityError, DatabaseError
-from django.test import TestCase
+from django.db import IntegrityError, DatabaseError, connections
+from django.test import TestCase, TransactionTestCase
 
 from demo.models import Book
 
 # TODO: Fix sqlite
+
 User = get_user_model()
 
 
-class AnnotateCheckConstraintTestCase(TestCase):
+class AnnotatedCheckConstraintNameTestCase(TransactionTestCase):
+    databases = settings.TEST_ENV_DB
+
+    @patch("django.VERSION", new_callable=PropertyMock(return_value=(2, 2)))
+    def test_correct_name_is_generated_for_django_less_than_30(self, version):
+        for db_alias in self._databases_names(include_mirrors=False):
+            connection = connections[db_alias]
+
+            connection.disable_constraint_checking()
+
+            for constraint in Book._meta.constraints:
+                name = "%(app_label)s_%(class)s_optional_field_provided"
+                constraint.model = "demo.Book"
+                constraint.name = name
+
+                path, args, kwargs = constraint.deconstruct()
+
+                self.assertEqual(kwargs["name"], "demo_book_optional_field_provided")
+
+
+class AnnotatedCheckConstraintTestCase(TestCase):
     databases = settings.TEST_ENV_DB
 
     @classmethod
     def setUpTestData(cls):
-        for db_name in cls._databases_names(include_mirrors=False):
-            cls.user = User.objects.db_manager(db_name).create_superuser(
+        for db_alias in cls._databases_names(include_mirrors=False):
+            cls.user = User.objects.db_manager(db_alias).create_superuser(
                 username="Admin", email="[email protected]", password="test",
             )
 
     def test_create_passes_with_annotated_check_constraint(self):
-        for db_name in self._databases_names(include_mirrors=False):
-            book = Book.objects.using(db_name).create(
+        for db_alias in self._databases_names(include_mirrors=False):
+            book = Book.objects.using(db_alias).create(
                 name="Business of the 21st Century",
                 created_by=self.user,
                 amount=Decimal("50"),
@@ -34,17 +56,17 @@ def test_create_passes_with_annotated_check_constraint(self):
             self.assertEqual(book.created_by, self.user)
 
     def test_create_is_invalid_with_annotated_check_constraint(self):
-        for db_name in self._databases_names(include_mirrors=False):
-            if db_name == "mysql":
+        for db_alias in self._databases_names(include_mirrors=False):
+            if db_alias == "mysql":
                 with self.assertRaises(DatabaseError):
-                    Book.objects.using(db_name).create(
+                    Book.objects.using(db_alias).create(
                         name="Business of the 21st Century",
                         created_by=self.user,
                         amount=Decimal("50"),
                     )
             else:
                 with self.assertRaises(IntegrityError):
-                    Book.objects.using(db_name).create(
+                    Book.objects.using(db_alias).create(
                         name="Business of the 21st Century",
                         created_by=self.user,
                         amount=Decimal("50"),

django_check_constraint/settings.py

@@ -13,6 +13,8 @@
 import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+from django.db import DEFAULT_DB_ALIAS
+
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
@@ -80,8 +82,12 @@
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
         "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
-        "TEST": {"DEPENDENCIES": TEST_ENV_DB},
-    }
+        "TEST": {
+            "DEPENDENCIES": [
+                d for d in os.environ["ENV_DB"].split(",") if d != DEFAULT_DB_ALIAS
+            ]
+        },
+    },
 }
 
 if "sqlite3" in TEST_ENV_DB: