summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/db/backends/base/schema.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/django/db/backends/base/schema.py b/django/db/backends/base/schema.py
index 00306d6803..d14f8919c0 100644
--- a/django/db/backends/base/schema.py
+++ b/django/db/backends/base/schema.py
@@ -593,7 +593,11 @@ class BaseDatabaseSchemaEditor(object):
))
# Nullability change?
if old_field.null != new_field.null:
- if new_field.null:
+ if (self.connection.features.interprets_empty_strings_as_nulls and
+ new_field.get_internal_type() in ("CharField", "TextField")):
+ # The field is nullable in the database anyway, leave it alone
+ pass
+ elif new_field.null:
null_actions.append((
self.sql_alter_column_null % {
"column": self.quote_name(new_field.column),