From 2405ba87089e0b01861f997a301ef52da6bfce2b Mon Sep 17 00:00:00 2001 From: Ross Lawley Date: Wed, 11 Jul 2012 16:11:13 +0100 Subject: [PATCH] Updated Changelog / AUTHORS refs hmarr/mongoengine#531 --- AUTHORS | 3 ++- docs/changelog.rst | 2 ++ mongoengine/base.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index af9c8370..6c074746 100644 --- a/AUTHORS +++ b/AUTHORS @@ -110,4 +110,5 @@ that much better: * Andrey Fedoseev * aparajita * Tristan Escalada - * Jaime Irurzun \ No newline at end of file + * Jaime Irurzun + * Alexandre González \ No newline at end of file diff --git a/docs/changelog.rst b/docs/changelog.rst index 6bb741e1..77b74cd3 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,6 +4,8 @@ Changelog Changes in 0.6.14 ================= +- Allow tuples for index meta +- Fixed use of str in instance checks - Fixed unicode support in transform update - Added support for add_to_set and each diff --git a/mongoengine/base.py b/mongoengine/base.py index e4f3f5cb..7a4998c8 100644 --- a/mongoengine/base.py +++ b/mongoengine/base.py @@ -706,7 +706,7 @@ class TopLevelDocumentMetaclass(DocumentMetaclass): meta['queryset_class'] = manager.queryset_class new_class.objects = manager - indicies = [meta['indexes']] + abstract_base_indexes + indicies = list(meta['indexes']) + abstract_base_indexes user_indexes = [QuerySet._build_index_spec(new_class, spec) for spec in indicies] + base_indexes new_class._meta['indexes'] = user_indexes