openstack
/
glance
Code Issues Proposed changes

Merge "Fix inconsistent doc string and code of db_sync"

This commit is contained in:
Jenkins 2014-01-22 02:03:21 +00:00 committed by Gerrit Code Review
parent 742a5cf067 1a9f95329f
commit 35bf0af69c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/cmd/manage.py
View File

@ -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)

9
glance/db/sqlalchemy/migration.py
View File

@ -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():