From ecbabc216dd2fd30ee67ee75dd2a1d8a88e4f574 Mon Sep 17 00:00:00 2001 From: Marc Tamlyn Date: Mon, 19 May 2014 14:57:06 +0100 Subject: [PATCH] Revert "Fixed regression from a2dd618e3b4a7472fab852da450ca5eef92a922f." This reverts commit 5a2556afb9b1b3ef6e0622552970c67ac84ecd28. --- django/db/backends/mysql/validation.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/django/db/backends/mysql/validation.py b/django/db/backends/mysql/validation.py index 49c88377b7..cd7503a352 100644 --- a/django/db/backends/mysql/validation.py +++ b/django/db/backends/mysql/validation.py @@ -17,8 +17,7 @@ class DatabaseValidation(BaseDatabaseValidation): if getattr(field, 'rel', None) is None: field_type = field.db_type(connection) - if (field_type is not None # Not all fields have a db_type (whyever...) - and field_type.startswith('varchar') # Look for CharFields... + 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)): errors.append(