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

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 = []