diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py --- a/rhodecode/__init__.py +++ b/rhodecode/__init__.py @@ -51,7 +51,7 @@ PYRAMID_SETTINGS = {} EXTENSIONS = {} __version__ = ('.'.join((str(each) for each in VERSION[:3]))) -__dbversion__ = 72 # defines current db version for migrations +__dbversion__ = 73 # defines current db version for migrations __platform__ = platform.system() __license__ = 'AGPLv3, and Commercial License' __author__ = 'RhodeCode GmbH' diff --git a/rhodecode/lib/dbmigrate/versions/073_version_4_8_0.py b/rhodecode/lib/dbmigrate/versions/073_version_4_8_0.py new file mode 100644 --- /dev/null +++ b/rhodecode/lib/dbmigrate/versions/073_version_4_8_0.py @@ -0,0 +1,63 @@ +import logging + +from sqlalchemy import * +from rhodecode.model import meta +from rhodecode.lib.dbmigrate.versions import _reset_base, notify + +log = logging.getLogger(__name__) + + +def get_by_key(cls, key): + return cls.query().filter(cls.ui_key == key).scalar() + + +def create_or_update_hook(cls, key, val, SESSION): + new_ui = get_by_key(cls, key) or cls() + new_ui.ui_section = 'hooks' + new_ui.ui_active = True + new_ui.ui_key = key + new_ui.ui_value = val + + SESSION().add(new_ui) + + +def upgrade(migrate_engine): + """ + Upgrade operations go here. + Don't create your own engine; bind migrate_engine to your metadata + """ + _reset_base(migrate_engine) + from rhodecode.lib.dbmigrate.schema import db_4_7_0_0 as db + + # issue fixups + fixups(db, meta.Session) + + +def downgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine + + +def fixups(models, _SESSION): + + cleanup_if_present = ( + 'pushkey.key_push', + ) + + for hook in cleanup_if_present: + ui_cfg = models.RhodeCodeUi.query().filter( + models.RhodeCodeUi.ui_key == hook).scalar() + if ui_cfg is not None: + log.info('Removing RhodeCodeUI for hook "%s".', hook) + _SESSION().delete(ui_cfg) + + to_add = [ + ('pushkey.key_push', + 'python:vcsserver.hooks.key_push'), + ] + + for hook, value in to_add: + log.info('Adding RhodeCodeUI for hook "%s".', hook) + create_or_update_hook(models.RhodeCodeUi, hook, value, _SESSION) + + _SESSION().commit() diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -358,6 +358,7 @@ class RhodeCodeUi(Base, BaseModel): HOOK_PRE_PUSH = 'prechangegroup.pre_push' HOOK_PRETX_PUSH = 'pretxnchangegroup.pre_push' HOOK_PUSH = 'changegroup.push_logger' + HOOK_PUSH_KEY = 'pushkey.key_push' # TODO: johbo: Unify way how hooks are configured for git and hg, # git part is currently hardcoded.