summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2012-09-24 12:53:37 +0100
committerAndrew Godwin <andrew@aeracode.org>2012-09-24 12:56:17 +0100
commit0354cecbfd0cbd4e7440d56332dbb4d20f6a2fb2 (patch)
treedf76153aa51ce1f94b3a822b991486c5ddf452f4 /django
parent588b839b26d922f2ddc2bbdd6377367f31e4ab4d (diff)
Fix nullability changing code
Diffstat (limited to 'django')
-rw-r--r--django/db/backends/schema.py2
-rw-r--r--django/db/backends/sqlite3/schema.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/db/backends/schema.py b/django/db/backends/schema.py
index 82fa160745..09d1202aad 100644
--- a/django/db/backends/schema.py
+++ b/django/db/backends/schema.py
@@ -495,7 +495,7 @@ class BaseDatabaseSchemaEditor(object):
))
else:
actions.append((
- self.sql_alter_column_null % {
+ self.sql_alter_column_not_null % {
"column": self.quote_name(new_field.column),
"type": new_type,
},
diff --git a/django/db/backends/sqlite3/schema.py b/django/db/backends/sqlite3/schema.py
index a1fd95fe8b..c1df0c7981 100644
--- a/django/db/backends/sqlite3/schema.py
+++ b/django/db/backends/sqlite3/schema.py
@@ -153,4 +153,4 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
self.quote_name(old_field.rel.through._meta.db_table),
))
# Delete the old through table
- self.delete_model(old_field.rel.through, force=True)
+ self.delete_model(old_field.rel.through)