Mercurial > kallithea
changeset 3767:e203cd3640db beta
sync sqlalchemy migrate with latest changes
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 16 Apr 2013 01:45:47 +0200 |
| parents | 848492e2aafa |
| children | f7d4e34306e0 |
| files | rhodecode/lib/dbmigrate/migrate/versioning/schema.py rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/dbmigrate/migrate/versioning/schema.py Tue Apr 16 01:42:24 2013 +0200 +++ b/rhodecode/lib/dbmigrate/migrate/versioning/schema.py Tue Apr 16 01:45:47 2013 +0200 @@ -7,7 +7,7 @@ from sqlalchemy import (Table, Column, MetaData, String, Text, Integer, create_engine) from sqlalchemy.sql import and_ -from sqlalchemy import exceptions as sa_exceptions +from sqlalchemy import exc as sa_exceptions from sqlalchemy.sql import bindparam from rhodecode.lib.dbmigrate.migrate import exceptions @@ -20,6 +20,7 @@ log = logging.getLogger(__name__) + class ControlledSchema(object): """A database under version control"""
--- a/rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py Tue Apr 16 01:42:24 2013 +0200 +++ b/rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py Tue Apr 16 01:45:47 2013 +0200 @@ -10,6 +10,7 @@ log = logging.getLogger(__name__) + def getDiffOfModelAgainstDatabase(metadata, engine, excludeTables=None): """ Return differences of model against database. @@ -17,7 +18,8 @@ :return: object which will evaluate to :keyword:`True` if there \ are differences else :keyword:`False`. """ - db_metadata = sqlalchemy.MetaData(engine, reflect=True) + db_metadata = sqlalchemy.MetaData(engine) + db_metadata.reflect() # sqlite will include a dynamically generated 'sqlite_sequence' table if # there are autoincrement sequences in the database; this should not be