[Fix #1091] Index.document() does not set index on Document class

Author: safwanrahman

elasticsearch_dsl/document.py

@@ -37,8 +37,10 @@ def __new__(cls, name, bases, attrs):
         new_cls = super(IndexMeta, cls).__new__(cls, name, bases, attrs)
         if cls._document_initialized:
             index_opts = attrs.pop('Index', None)
-            new_cls._index = cls.construct_index(index_opts, bases)
-            new_cls._index.document(new_cls)
+            index = cls.construct_index(index_opts, bases)
+            if index:
+                new_cls._index = index
+                index.document(new_cls)
         cls._document_initialized = True
         return new_cls
 
@@ -48,8 +50,9 @@ def construct_index(cls, opts, bases):
             for b in bases:
                 if hasattr(b, '_index'):
                     return b._index
-            # create an all-matching index pattern
-            return Index('*')
+
+            # return None as there are no index_opts
+            return None
 
         i = Index(
             getattr(opts, 'name', '*'),

elasticsearch_dsl/index.py

@@ -159,6 +159,11 @@ class Post(Document):
                 'Index object cannot have multiple types, %s already set, '
                 'trying to assign %s.' % (doc_type, name))
         self._doc_types.append(document)
+
+        # If the document does not have any index, set this index as document index
+        if document._index is None:
+            document._index = self
+
         return document
     doc_type = document