summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
authorAdam DePue <adepue@hearsaycorp.com>2014-11-05 02:57:47 +0000
committerTim Graham <timograham@gmail.com>2014-11-13 11:03:01 +0100
commit2d12a599383efff4ac1914e4cc5cf3b08cb2ff53 (patch)
tree54bd7b41fa24ba29cfad7c0e5fdae8842de33f30 /django/db
parentd4bec655ae1c1122d7aea4bf8e58cc8a2b7bcc74 (diff)
[1.7.x] Fixed #23761 -- Fixed crash with MySQL validator and db_type is None.
The issue was fixed on master in e9103402c0fa873aea58a6a11dba510cd308cb84.
Diffstat (limited to 'django/db')
-rw-r--r--django/db/backends/mysql/validation.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/db/backends/mysql/validation.py b/django/db/backends/mysql/validation.py
index cd7503a352..d69cb7e3e0 100644
--- a/django/db/backends/mysql/validation.py
+++ b/django/db/backends/mysql/validation.py
@@ -17,6 +17,10 @@ class DatabaseValidation(BaseDatabaseValidation):
if getattr(field, 'rel', None) is None:
field_type = field.db_type(connection)
+ # Ignore any non-concrete fields
+ if field_type is None:
+ return errors
+
if (field_type.startswith('varchar') # Look for CharFields...
and field.unique # ... that are unique
and (field.max_length is None or int(field.max_length) > 255)):