Version bump to 0.8.7; allow plain_index_fields including unique_fiel…

…ds; does not work due to https://code.djangoproject.com/ticket/24082
tuffnatty · Apr 27, 2018 · d5efad1 · d5efad1
1 parent 652745c
commit d5efad1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/xsd_to_django_model/__init__.py b/xsd_to_django_model/__init__.py
@@ -1 +1 @@
-__version__ = '0.8.6'
+__version__ = '0.8.7'
diff --git a/xsd_to_django_model/xsd_to_django_model.py b/xsd_to_django_model/xsd_to_django_model.py
@@ -457,7 +457,9 @@ def build_code(self):
             ['GinIndex(["%s"])' % f
              for f in model_options.get('gin_index_fields', [])] + \
             ['models.Index(["%s"])' % f
-             for f in model_options.get('plain_index_fields', [])]
+             for f in list(set(model_options.get('plain_index_fields', [])) -
+                           set(model_options.get('unique_fields', [])))
+             if f != model_options.get('primary_key')]
         if indexes:
             meta.append('indexes = [\n            %s\n        ]'
                         % ',\n            '.join(sorted(indexes)))
@@ -1100,7 +1102,7 @@ def make_a_field(self, typename, name, dotted_name,
                     o['null'] = null or get_null(el_def)
                     simpletype_base = self.flatten_ct(ct2_def, typename, **o)
                     if not simpletype_base:
-                        return
+                        return {}
                     el_type = simpletype_base
                 else:
                     logger.warning('complexType not found'
@@ -1215,7 +1217,7 @@ def make_a_field(self, typename, name, dotted_name,
             this_model.number_field = name
         elif match(name, model, 'unique_fields'):
             options.append('unique=True')
-        elif match(name, model, 'index_fields'):
+        if match(name, model, 'index_fields'):
             options.append('db_index=True')
         elif (match(name, model, 'gin_index_fields') or
               match(name, model, 'plain_index_fields')):