innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.7.x] Fix test breakage from previous state fix

This commit is contained in:
Andrew Godwin 2014-06-12 11:12:07 -07:00
parent 83e96ee99b
commit 49d4ace2d2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/migrations/state.py
View File

@ -204,6 +204,12 @@ class ModelState(object):
options[name] = set(normalize_together(it)) options[name] = set(normalize_together(it))
else: else:
options[name] = model._meta.original_attrs[name] 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): def flatten_bases(model):
bases = [] bases = []