Show More
@@ -32,6 +32,7 b' from rhodecode.lib.db_manage import DbMa' | |||||
32 |
|
32 | |||
33 | log = logging.getLogger(__name__) |
|
33 | log = logging.getLogger(__name__) | |
34 |
|
34 | |||
|
35 | ||||
35 | class UpgradeDb(BasePasterCommand): |
|
36 | class UpgradeDb(BasePasterCommand): | |
36 | """Command used for paster to upgrade our database to newer version |
|
37 | """Command used for paster to upgrade our database to newer version | |
37 | """ |
|
38 | """ | |
@@ -57,8 +58,6 b' class UpgradeDb(BasePasterCommand):' | |||||
57 |
|
58 | |||
58 | dbmanage.upgrade() |
|
59 | dbmanage.upgrade() | |
59 |
|
60 | |||
60 |
|
||||
61 |
|
||||
62 | def update_parser(self): |
|
61 | def update_parser(self): | |
63 | self.parser.add_option('--sql', |
|
62 | self.parser.add_option('--sql', | |
64 | action='store_true', |
|
63 | action='store_true', |
@@ -12,7 +12,8 b' from sqlalchemy import __version__ as _s' | |||||
12 |
|
12 | |||
13 | warnings.simplefilter('always', DeprecationWarning) |
|
13 | warnings.simplefilter('always', DeprecationWarning) | |
14 |
|
14 | |||
15 |
_sa_version = tuple(int(re.match("\d+", x).group(0)) |
|
15 | _sa_version = tuple(int(re.match("\d+", x).group(0)) | |
|
16 | for x in _sa_version.split(".")) | |||
16 | SQLA_06 = _sa_version >= (0, 6) |
|
17 | SQLA_06 = _sa_version >= (0, 6) | |
17 |
|
18 | |||
18 | del re |
|
19 | del re | |
@@ -21,8 +22,8 b' del _sa_version' | |||||
21 | from rhodecode.lib.dbmigrate.migrate.changeset.schema import * |
|
22 | from rhodecode.lib.dbmigrate.migrate.changeset.schema import * | |
22 | from rhodecode.lib.dbmigrate.migrate.changeset.constraint import * |
|
23 | from rhodecode.lib.dbmigrate.migrate.changeset.constraint import * | |
23 |
|
24 | |||
24 |
sqlalchemy.schema.Table.__bases__ += (ChangesetTable, |
|
25 | sqlalchemy.schema.Table.__bases__ += (ChangesetTable,) | |
25 |
sqlalchemy.schema.Column.__bases__ += (ChangesetColumn, |
|
26 | sqlalchemy.schema.Column.__bases__ += (ChangesetColumn,) | |
26 |
sqlalchemy.schema.Index.__bases__ += (ChangesetIndex, |
|
27 | sqlalchemy.schema.Index.__bases__ += (ChangesetIndex,) | |
27 |
|
28 | |||
28 |
sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause, |
|
29 | sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause,) |
@@ -71,11 +71,6 b' class InvalidScriptError(ScriptError):' | |||||
71 | """Invalid script error.""" |
|
71 | """Invalid script error.""" | |
72 |
|
72 | |||
73 |
|
73 | |||
74 | class InvalidVersionError(Error): |
|
|||
75 | """Invalid version error.""" |
|
|||
76 |
|
||||
77 | # migrate.changeset |
|
|||
78 |
|
||||
79 | class NotSupportedError(Error): |
|
74 | class NotSupportedError(Error): | |
80 | """Not supported error""" |
|
75 | """Not supported error""" | |
81 |
|
76 | |||
@@ -83,5 +78,6 b' class NotSupportedError(Error):' | |||||
83 | class InvalidConstraintError(Error): |
|
78 | class InvalidConstraintError(Error): | |
84 | """Invalid constraint error""" |
|
79 | """Invalid constraint error""" | |
85 |
|
80 | |||
|
81 | ||||
86 | class MigrateDeprecationWarning(DeprecationWarning): |
|
82 | class MigrateDeprecationWarning(DeprecationWarning): | |
87 | """Warning for deprecated features in Migrate""" |
|
83 | """Warning for deprecated features in Migrate""" |
General Comments 0
You need to be logged in to leave comments.
Login now