summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-06-12 11:12:07 -0700
committerAndrew Godwin <andrew@aeracode.org>2014-06-12 11:12:07 -0700
commit386166970c506b5f7b70f63bfb86d1ea64a980cf (patch)
treeca5f77ed1ef7b212bb95861a9429771219a9468c
parent7b17350a1bfa527358e722baf962a5f9cfb838ea (diff)
Fix test breakage from previous state fix
-rw-r--r--django/db/migrations/state.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py
index 750383c39f..b8c614d1a1 100644
--- a/django/db/migrations/state.py
+++ b/django/db/migrations/state.py
@@ -204,6 +204,12 @@ class ModelState(object):
options[name] = set(normalize_together(it))
else:
options[name] = model._meta.original_attrs[name]
+ # If we're ignoring relationships, remove all field-listing model
+ # options (that option basically just means "make a stub model")
+ if exclude_rels:
+ for key in ["unique_together", "index_together", "order_with_respect_to"]:
+ if key in options:
+ del options[key]
def flatten_bases(model):
bases = []