diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-01-22 02:03:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-01-22 02:03:21 +0000 |
| commit | 35bf0af69cc128f7878339c9904f9af487e8df8c (patch) | |
| tree | f7cb656a742a774c15e5d6e752b169c1110ed7bd | |
| parent | 742a5cf06769eec545521634c9eaec442289b8c6 (diff) | |
| parent | 1a9f95329f269673efffb35ca403292f7d404333 (diff) | |
| download | glance-2014.1.b2.tar.gz | |
Merge "Fix inconsistent doc string and code of db_sync"2014.1.b2
| -rwxr-xr-x | glance/cmd/manage.py | 2 | ||||
| -rw-r--r-- | glance/db/sqlalchemy/migration.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/glance/cmd/manage.py b/glance/cmd/manage.py index 08a643011..4a950e1c3 100755 --- a/glance/cmd/manage.py +++ b/glance/cmd/manage.py @@ -87,7 +87,7 @@ class DbCommands(object): help='Current Database version') def sync(self, version=None, current_version=None): """ - Place a database under migration control and upgrade, + Place a database under migration control and upgrade/downgrade it, creating first if necessary. """ migration.db_sync(version, current_version) diff --git a/glance/db/sqlalchemy/migration.py b/glance/db/sqlalchemy/migration.py index 224b0bd8a..afeefd3f7 100644 --- a/glance/db/sqlalchemy/migration.py +++ b/glance/db/sqlalchemy/migration.py @@ -101,7 +101,7 @@ def _version_control(version): def db_sync(version=None, current_version=None): """ - Place a database under migration control and perform an upgrade + Place a database under migration control and upgrade/downgrade it. :retval version number """ @@ -112,10 +112,13 @@ def db_sync(version=None, current_version=None): if current_version is None: current_version = int(db_version()) + if version is not None and int(version) < current_version: - downgrade(version=version) + return downgrade(version=version) elif version is None or int(version) > current_version: - upgrade(version=version) + return upgrade(version=version) + else: + return current_version def get_migrate_repo_path(): |