Caution the admins about deleting the users' media though.

[mediagoblin.git] / mediagoblin / db / util.py

diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 1a4dd95ba81a04a02ffccd8ce43b401b3052a7b1..0f3220d2d89019846f63720d511f164d347a6bf3 100644 (file)
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -86,18 +86,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)
 
@@ -115,6 +122,9 @@ def remove_deprecated_indexes(database, deprecated_indexes=DEPRECATED_INDEXES):
 # Don't set this yourself!  RegisterMigration will automatically fill
 # this with stuff via decorating methods in migrations.py
 
+class MissingCurrentMigration(Exception): pass
+
+
 MIGRATIONS = {}
 
 
@@ -137,6 +147,8 @@ class RegisterMigration(object):
     """
     def __init__(self, migration_number, migration_registry=MIGRATIONS):
         assert migration_number > 0, "Migration number must be > 0!"
+        assert not migration_registry.has_key(migration_number), \
+            "Duplicate migration numbers detected!  That's not allowed!"
 
         self.migration_number = migration_number
         self.migration_registry = migration_registry
@@ -164,6 +176,16 @@ class MigrationManager(object):
         self.migration_registry = migration_registry
         self._sorted_migrations = None
 
+    def _ensure_current_migration_record(self):
+        """
+        If there isn't a database[u'app_metadata'] mediagoblin entry
+        with the 'current_migration', throw an error.
+        """
+        if self.database_current_migration() is None:
+            raise MissingCurrentMigration(
+                "Tried to call function which requires "
+                "'current_migration' set in database")
+
     @property
     def sorted_migrations(self):
         """
@@ -235,9 +257,7 @@ class MigrationManager(object):
         Note that calling this will set your migration version to the
         latest version if it isn't installed to anything yet!
         """
-        # If we aren't set to any version number, presume we're at the
-        # latest (which means we'll do nothing here...)
-        self.install_migration_version_if_missing()
+        self._ensure_current_migration_record()
 
         db_current_migration = self.database_current_migration()
 
@@ -258,6 +278,10 @@ class MigrationManager(object):
            run post-migration.  Takes (migration_number, migration_func)
            as arguments
         """
+        # If we aren't set to any version number, presume we're at the
+        # latest (which means we'll do nothing here...)
+        self.install_migration_version_if_missing()
+
         for migration_number, migration_func in self.migrations_to_run():
             if pre_callback:
                 pre_callback(migration_number, migration_func)