summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Tamlyn <marc.tamlyn@gmail.com>2014-09-04 16:32:51 +0100
committerMarc Tamlyn <marc.tamlyn@gmail.com>2014-09-06 19:01:06 +0100
commit14c8456ffe7e6388383e6fe5c3f51cd20810ea49 (patch)
tree367c509d9f75b976657551fe12b3ae689f512577
parente5febfb3c3873e535be1cde047a1f738922564d5 (diff)
Fixed #23416 -- Make sure DatabaseCreation respects checks.
Migrations respected Field.db_parameters()['check'], but DatabaseCreation was still using just Field.db_type().
-rw-r--r--django/db/backends/creation.py5
-rw-r--r--docs/releases/1.7.1.txt3
-rw-r--r--tests/commands_sql/models.py1
-rw-r--r--tests/commands_sql/tests.py13
4 files changed, 21 insertions, 1 deletions
diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py
index 99c49590e0..9077399adc 100644
--- a/django/db/backends/creation.py
+++ b/django/db/backends/creation.py
@@ -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:
diff --git a/docs/releases/1.7.1.txt b/docs/releases/1.7.1.txt
index 64a673f5a6..90673a826f 100644
--- a/docs/releases/1.7.1.txt
+++ b/docs/releases/1.7.1.txt
@@ -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`).
diff --git a/tests/commands_sql/models.py b/tests/commands_sql/models.py
index 78ad722307..fe5768b3dd 100644
--- a/tests/commands_sql/models.py
+++ b/tests/commands_sql/models.py
@@ -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()
diff --git a/tests/commands_sql/tests.py b/tests/commands_sql/tests.py
index 6139bbafa2..83c1e06202 100644
--- a/tests/commands_sql/tests.py
+++ b/tests/commands_sql/tests.py
@@ -1,6 +1,7 @@
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)