Commit: 31cc45a051263f0351a4767bbda5ff469dda34a5 - allura (git)

allura

Commit MetaInfo

• Revision: 31cc45a051263f0351a4767bbda5ff469dda34a5 (tree)
• Time: 2010-05-05 03:03:51
• Author: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#330] - add flyway options, as well as flyway initialization on project DB create

Change Summary

• modified: pyforge/flyway/command.py
• modified: pyforge/flyway/runner.py
• modified: pyforge/pyforge/model/project.py

Incremental Difference

--- a/pyforge/flyway/command.py
+++ b/pyforge/flyway/command.py
@@ -22,11 +22,13 @@ class MigrateCommand(command.Command):
     parser.add_option('--log-level', dest='log_level', default='INFO')
     parser.add_option('--reset', dest='reset', action='store_true', default=False)
     parser.add_option('-d', '--dry-run', dest='dry_run', action='store_true', default=False)
+    parser.add_option('-s', '--status', dest='status_only', action='store_true', default=False)
+    parser.add_option('--force', dest='force', action='store_true', default=False)
 
     def command(self):
         self._setup_logging()
         self._load_migrations()
-        from .runner import run_migration, reset_migration
+        from .runner import run_migration, reset_migration, show_status, set_status
         parsed_connection_url = parse_uri(self.options.connection_url)
         if not parsed_connection_url['path']:
             parsed_connection_url['path'] += '/'
@@ -45,7 +47,11 @@ class MigrateCommand(command.Command):
                       parsed_connection_url['port'])
         for ds in datastores:
             self.log.info('Migrate DB: %s', ds.database)
-            if self.options.reset:
+            if self.options.status_only:
+                show_status(ds)
+            elif self.options.force:
+                set_status(ds, self._target_versions())
+            elif self.options.reset:
                 reset_migration(ds, dry_run=self.options.dry_run)
             else:
                 run_migration(ds, self._target_versions(), dry_run=self.options.dry_run)

--- a/pyforge/flyway/runner.py
+++ b/pyforge/flyway/runner.py
@@ -32,6 +32,31 @@ def run_migration(datastore, target_versions, dry_run):
         step.apply(info.versions)
         info.m.save()
 
+def show_status(datastore):
+    # Get the migration status of the db
+    session = MigrationInfo.__mongometa__.session
+    session.bind = datastore
+    info = MigrationInfo.m.get()
+    if info is None:
+        info = MigrationInfo.make({})
+    for k,v in info.versions.iteritems():
+        log.info('%s=%s', k, v)
+
+def set_status(datastore, target_versions):
+    # Get the migration status of the db
+    session = MigrationInfo.__mongometa__.session
+    session.bind = datastore
+    info = MigrationInfo.m.get()
+    if info is None:
+        info = MigrationInfo.make({})
+    latest_versions = Migration.latest_versions()
+    for k,v in target_versions.iteritems():
+        cur = info.versions.get(k, -1)
+        islatest = ' (LATEST)' if v == latest_versions[k] else ''
+        log.info('FORCE %s=%s%s (current=%s)', k, v, islatest, cur)
+    info.versions.update(target_versions)
+    info.m.save()
+
 def plan_migration(session, ormsession, info, target):
     '''Return the optimal list of graph.MigrationSteps to run in order to
     satisfy the target requirements'''

--- a/pyforge/pyforge/model/project.py
+++ b/pyforge/pyforge/model/project.py
@@ -147,6 +147,7 @@ class Neighborhood(MappedClass):
                                      + 'You can edit this description in the admin page'),
                         database=database,
                         is_root=True)
+            p.configure_flyway_initial()
             with h.push_config(c, project=p, user=user):
                 # Install default named roles (#78)
                 role_owner = auth.ProjectRole(name='Owner')
@@ -466,6 +467,16 @@ class Project(MappedClass):
         project_users = uniq([r.user for r in self.roles if not r.user.username.startswith('*')])
         return project_users
 
+    def configure_flyway_initial(self):
+        from flyway.model import MigrationInfo
+        from flyway.migrate import Migration
+        with h.push_config(c, project=self):
+            mi = project_doc_session.get(MigrationInfo)
+            if mi is None:
+                mi = MigrationInfo.make({})
+            mi.versions.update(Migration.latest_versions())
+            project_doc_session.save(mi)
+
 class AppConfig(MappedClass):
     class __mongometa__:
         session = project_orm_session