From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 9 Jul 2011 21:51:19 +0000 (-0500)
Subject: Changing things back so that we keep information about deprecated
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=50bb8fe5e44eae5974121e9b518d373205251eb9;p=mediagoblin.git

Changing things back so that we keep information about deprecated
indexes around.
---

diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 70c37945..37e6586f 100644
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -81,18 +81,25 @@ def remove_deprecated_indexes(database, deprecated_indexes=DEPRECATED_INDEXES):
     Args:
      - database: pymongo or mongokit database instance.
      - deprecated_indexes: the indexes to deprecate in the pattern of:
-       {'collection': ['index_identifier1', 'index_identifier2']}
+       {'collection_name': {
+            'identifier': {
+                'index': [index_foo_goes_here],
+                'unique': True}}
+
+       (... although we really only need the 'identifier' here, as the
+       rest of the information isn't used in this case.  But it's kept
+       around so we can remember what it was)
 
     Returns:
       A list of indexes removed in form ('collection', 'index_name')
     """
     indexes_removed = []
 
-    for collection_name, index_names in deprecated_indexes.iteritems():
+    for collection_name, indexes in deprecated_indexes.iteritems():
         collection = database[collection_name]
         collection_indexes = collection.index_information().keys()
 
-        for index_name in index_names:
+        for index_name, index_data in indexes.iteritems():
             if index_name in collection_indexes:
                 collection.drop_index(index_name)