diff --git a/rhodecode/lib/dbmigrate/__init__.py b/rhodecode/lib/dbmigrate/__init__.py --- a/rhodecode/lib/dbmigrate/__init__.py +++ b/rhodecode/lib/dbmigrate/__init__.py @@ -32,6 +32,7 @@ from rhodecode.lib.db_manage import DbMa log = logging.getLogger(__name__) + class UpgradeDb(BasePasterCommand): """Command used for paster to upgrade our database to newer version """ @@ -57,8 +58,6 @@ class UpgradeDb(BasePasterCommand): dbmanage.upgrade() - - def update_parser(self): self.parser.add_option('--sql', action='store_true', diff --git a/rhodecode/lib/dbmigrate/migrate/changeset/__init__.py b/rhodecode/lib/dbmigrate/migrate/changeset/__init__.py --- a/rhodecode/lib/dbmigrate/migrate/changeset/__init__.py +++ b/rhodecode/lib/dbmigrate/migrate/changeset/__init__.py @@ -12,7 +12,8 @@ from sqlalchemy import __version__ as _s warnings.simplefilter('always', DeprecationWarning) -_sa_version = tuple(int(re.match("\d+", x).group(0)) for x in _sa_version.split(".")) +_sa_version = tuple(int(re.match("\d+", x).group(0)) + for x in _sa_version.split(".")) SQLA_06 = _sa_version >= (0, 6) del re @@ -21,8 +22,8 @@ del _sa_version from rhodecode.lib.dbmigrate.migrate.changeset.schema import * from rhodecode.lib.dbmigrate.migrate.changeset.constraint import * -sqlalchemy.schema.Table.__bases__ += (ChangesetTable, ) -sqlalchemy.schema.Column.__bases__ += (ChangesetColumn, ) -sqlalchemy.schema.Index.__bases__ += (ChangesetIndex, ) +sqlalchemy.schema.Table.__bases__ += (ChangesetTable,) +sqlalchemy.schema.Column.__bases__ += (ChangesetColumn,) +sqlalchemy.schema.Index.__bases__ += (ChangesetIndex,) -sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause, ) +sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause,) diff --git a/rhodecode/lib/dbmigrate/migrate/exceptions.py b/rhodecode/lib/dbmigrate/migrate/exceptions.py --- a/rhodecode/lib/dbmigrate/migrate/exceptions.py +++ b/rhodecode/lib/dbmigrate/migrate/exceptions.py @@ -71,11 +71,6 @@ class InvalidScriptError(ScriptError): """Invalid script error.""" -class InvalidVersionError(Error): - """Invalid version error.""" - -# migrate.changeset - class NotSupportedError(Error): """Not supported error""" @@ -83,5 +78,6 @@ class NotSupportedError(Error): class InvalidConstraintError(Error): """Invalid constraint error""" + class MigrateDeprecationWarning(DeprecationWarning): """Warning for deprecated features in Migrate"""