aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2013-07-29 17:15:29 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2013-07-29 17:15:29 -0400
commit08cd10d84fd89df3f0cad3835ba8ab8b8000d4b2 (patch)
treeb384d06ffe400e0aa126dd65c7a7b4f8344e4d56 /mediagoblin/db
parentf2b2008da51ff554df1af0e5a14a73aff4d89c33 (diff)
downloadmediagoblin-08cd10d84fd89df3f0cad3835ba8ab8b8000d4b2.tar.lz
mediagoblin-08cd10d84fd89df3f0cad3835ba8ab8b8000d4b2.tar.xz
mediagoblin-08cd10d84fd89df3f0cad3835ba8ab8b8000d4b2.zip
I actually had to do a bit more work than I thought, because I needed to account
for plugins. In this commit I changed the MigrationManager and DatabaseData ob- jects to account for FOUNDATIONS in any plugin's (or main program's) models.py file.
Diffstat (limited to 'mediagoblin/db')
-rw-r--r--mediagoblin/db/migration_tools.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/mediagoblin/db/migration_tools.py b/mediagoblin/db/migration_tools.py
index 1192836d..ad137683 100644
--- a/mediagoblin/db/migration_tools.py
+++ b/mediagoblin/db/migration_tools.py
@@ -29,7 +29,7 @@ class MigrationManager(object):
to the latest migrations, etc.
"""
- def __init__(self, name, models, migration_registry, session,
+ def __init__(self, name, models, foundations, migration_registry, session,
printer=simple_printer):
"""
Args:
@@ -40,6 +40,7 @@ class MigrationManager(object):
"""
self.name = unicode(name)
self.models = models
+ self.foundations = foundations
self.session = session
self.migration_registry = migration_registry
self._sorted_migrations = None
@@ -145,12 +146,11 @@ class MigrationManager(object):
Create the table foundations (default rows) as layed out in FOUNDATIONS
in mediagoblin.db.models
"""
- from mediagoblin.db.models import FOUNDATIONS as MAIN_FOUNDATIONS
- for Model, rows in MAIN_FOUNDATIONS.items():
- print u'\n--> Laying foundations for %s table' % Model.__name__
+ for Model, rows in self.foundations.items():
+ print u'\n + Laying foundations for %s table' % (Model.__name__)
for parameters in rows:
- row = Model(**parameters)
- row.save()
+ new_row = Model(**parameters)
+ new_row.save()
def create_new_migration_record(self):
"""
@@ -215,8 +215,7 @@ class MigrationManager(object):
self.init_tables()
# auto-set at latest migration number
self.create_new_migration_record()
- if self.name==u'__main__':
- self.populate_table_foundations()
+ self.populate_table_foundations()
self.printer(u"done.\n")
self.set_current_migration()