summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2016-09-08 00:57:04 -0400
committerSimon Charette <charette.s@gmail.com>2016-09-09 00:48:50 -0400
commitaca939b6e545debd64c6464976abac8fd716b589 (patch)
treed92483947688cd0febd3638f52f22843c41808f3 /django
parent331ca5391eb64cbac3a001209257beb93522d587 (diff)
Fixed #27195 -- Stopped dropping default when adding a nullable column.
Thanks Rob Golding from Zapier for the report.
Diffstat (limited to 'django')
-rw-r--r--django/db/backends/base/schema.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/backends/base/schema.py b/django/db/backends/base/schema.py
index aae64e3be7..ce929fd4e4 100644
--- a/django/db/backends/base/schema.py
+++ b/django/db/backends/base/schema.py
@@ -420,7 +420,7 @@ class BaseDatabaseSchemaEditor(object):
self.execute(sql, params)
# Drop the default if we need to
# (Django usually does not use in-database defaults)
- if not self.skip_default(field) and field.default is not None:
+ if not self.skip_default(field) and self.effective_default(field) is not None:
sql = self.sql_alter_column % {
"table": self.quote_name(model._meta.db_table),
"changes": self.sql_alter_column_no_default % {