test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6310 from apollo13/informix 

Pass type to sql_alter_column*.
This commit is contained in:
Andrew Godwin 2016-03-18 19:47:15 -03:00
parent 1d0abeaf75 37cde8667e
commit 2b3a941457
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/base/schema.py
View File

@ -577,6 +577,7 @@ class BaseDatabaseSchemaEditor(object):
actions.append(( actions.append((
self.sql_alter_column_default % { self.sql_alter_column_default % {
"column": self.quote_name(new_field.column), "column": self.quote_name(new_field.column),
"type": new_type,
"default": self.prepare_default(new_default), "default": self.prepare_default(new_default),
}, },
[], [],
@ -585,6 +586,7 @@ class BaseDatabaseSchemaEditor(object):
actions.append(( actions.append((
self.sql_alter_column_default % { self.sql_alter_column_default % {
"column": self.quote_name(new_field.column), "column": self.quote_name(new_field.column),
"type": new_type,
"default": "%s", "default": "%s",
}, },
[new_default], [new_default],
@ -738,6 +740,7 @@ class BaseDatabaseSchemaEditor(object):
"table": self.quote_name(model._meta.db_table), "table": self.quote_name(model._meta.db_table),
"changes": self.sql_alter_column_no_default % { "changes": self.sql_alter_column_no_default % {
"column": self.quote_name(new_field.column), "column": self.quote_name(new_field.column),
"type": new_type,
} }
} }
self.execute(sql) self.execute(sql)