summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAmos Onn <amosonn@gmail.com>2015-12-08 19:03:31 +0200
committerTim Graham <timograham@gmail.com>2015-12-09 11:08:01 -0500
commitf076cf07effe54af8a28f22431c3c76a8af61fc5 (patch)
tree05006a0eaef69ece0fcdbbf04713355723c38f78 /django
parentbc8bc8a0123b9a4c14beb62f71616a925538ca5c (diff)
[1.9.x] Fixed #25896 -- Fixed state bug in SeparateDatabaseAndState.database_backwards().
Backport of 542b7f6c50df18f2aa201cf1de81577c1bee643c from master
Diffstat (limited to 'django')
-rw-r--r--django/db/migrations/operations/special.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/migrations/operations/special.py b/django/db/migrations/operations/special.py
index e1ce9a07b5..6bbae602db 100644
--- a/django/db/migrations/operations/special.py
+++ b/django/db/migrations/operations/special.py
@@ -50,7 +50,7 @@ class SeparateDatabaseAndState(Operation):
to_state = base_state.clone()
for dbop in self.database_operations[:-(pos + 1)]:
dbop.state_forwards(app_label, to_state)
- from_state = base_state.clone()
+ from_state = to_state.clone()
database_operation.state_forwards(app_label, from_state)
database_operation.database_backwards(app_label, schema_editor, from_state, to_state)