engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rc-upgrade-db: added option to force update a version.

Browse source
This commit is contained in:
Marcin Kuzminski 2019-01-19 22:34:39 +01:00
parent 346dfb4557
commit f8ac3e12cb
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rhodecode/lib/db_manage.py
View file

@ -156,8 +156,11 @@ class DbManage(object):
'rhodecode/lib/dbmigrate')
db_uri = self.dburi
if version:
DbMigrateVersion.set_version(version)
try:
curr_version = version or api.db_version(db_uri, repository_path)
curr_version = api.db_version(db_uri, repository_path)
msg = ('Found current database db_uri under version '
'control with version {}'.format(curr_version))

11
rhodecode/lib/rc_commands/upgrade_db.py
View file

@ -25,6 +25,7 @@ import pyramid.paster
from rhodecode.lib.pyramid_utils import bootstrap
from rhodecode.lib.db_manage import DbManage
from rhodecode.lib.utils2 import safe_int
log = logging.getLogger(__name__)
@ -33,11 +34,13 @@ log = logging.getLogger(__name__)
@click.argument('ini_path', type=click.Path(exists=True))
@click.option('--force-yes/--force-no', default=None,
help="Force yes/no to every question")
def main(ini_path, force_yes):
return command(ini_path, force_yes)
@click.option('--force-version', default=None,
help="Force upgrade from version")
def main(ini_path, force_yes, force_version):
return command(ini_path, force_yes, force_version)
def command(ini_path, force_yes):
def command(ini_path, force_yes, force_version):
pyramid.paster.setup_logging(ini_path)
with bootstrap(ini_path, env={'RC_CMD_UPGRADE_DB': '1'}) as env:
@ -49,4 +52,4 @@ def command(ini_path, force_yes):
dbmanage = DbManage(
log_sql=True, dbconf=db_uri, root='.', tests=False,
cli_args=options)
dbmanage.upgrade()
dbmanage.upgrade(version=safe_int(force_version))