Commit 14c8456f authored by Marc Tamlyn's avatar Marc Tamlyn
Browse files

Fixed #23416 -- Make sure DatabaseCreation respects checks. 

Migrations respected Field.db_parameters()['check'], but
DatabaseCreation was still using just Field.db_type().
parent e5febfb3

django/db/backends/creation.py

+4 −1
Original line number Diff line number Diff line
@@ -77,7 +77,10 @@ class BaseDatabaseCreation(object): 
        pending_references = {}

        qn = self.connection.ops.quote_name

        for f in opts.local_fields:

            col_type = f.db_type(connection=self.connection)

            db_params = f.db_parameters(connection=self.connection)

            col_type = db_params['type']

            if db_params['check']:

                col_type = '%s CHECK (%s)' % (col_type, db_params['check'])

            col_type_suffix = f.db_type_suffix(connection=self.connection)

            tablespace = f.db_tablespace or opts.db_tablespace

            if col_type is None:

docs/releases/1.7.1.txt

+3 −0
Original line number Diff line number Diff line
@@ -13,3 +13,6 @@ Bugfixes 


* Fixed a ``UnicodeDecodeError`` when the ``flush`` error message contained

  Unicode characters (:ticket:`22882`).



* Reinstated missing ``CHECK`` SQL clauses which were omitted on some backends

  when not using migrations (:ticket:`23416`).

tests/commands_sql/models.py

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ class Comment(models.Model): 
class Book(models.Model):

    title = models.CharField(max_length=100, db_index=True)

    comments = models.ManyToManyField(Comment)

    counter = models.PositiveIntegerField()

tests/commands_sql/tests.py

+13 −0
Original line number Diff line number Diff line 
from __future__ import unicode_literals



import re

import unittest



from django.apps import apps

from django.core.management.color import no_style
@@ -43,6 +44,18 @@ class SQLCommandsTestCase(TestCase): 
            'commands_sql_comment', 'commands_sql_book', 'commands_sql_book_comments'

        })



    @unittest.skipUnless('PositiveIntegerField' in connections[DEFAULT_DB_ALIAS].creation.data_type_check_constraints, 'Backend does not have checks.')

    def test_sql_create_check(self):

        """Regression test for #23416 -- Check that db_params['check'] is respected."""

        app_config = apps.get_app_config('commands_sql')

        output = sql_create(app_config, no_style(), connections[DEFAULT_DB_ALIAS])

        success = False

        for statement in output:

            if 'CHECK' in statement:

                success = True

        if not success:

            self.fail("'CHECK' not found in ouput %s" % output)



    def test_sql_delete(self):

        app_config = apps.get_app_config('commands_sql')

        output = sql_delete(app_config, no_style(), connections[DEFAULT_DB_ALIAS], close_connection=False)