kallithea Changeset - e203cd3640db

Changeset - e203cd3640db

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-04-16 01:45:47
marcin@python-works.com

sync sqlalchemy migrate with latest changes

2 files changed with 5 insertions and 2 deletions:

rhodecode/lib/dbmigrate/migrate/versioning/schema.py

rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py

0 comments (0 inline, 0 general)

rhodecode/lib/dbmigrate/migrate/versioning/schema.py

➞

Show inline comments

@@ @@ -4,25 +4,26 @@ @@
 import sys
 import logging
 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
 from rhodecode.lib.dbmigrate.migrate.changeset import SQLA_07
 from rhodecode.lib.dbmigrate.migrate.versioning import genmodel, schemadiff
 from rhodecode.lib.dbmigrate.migrate.versioning.repository import Repository
 from rhodecode.lib.dbmigrate.migrate.versioning.util import load_model
 from rhodecode.lib.dbmigrate.migrate.versioning.version import VerNum
 log = logging.getLogger(__name__)
 class ControlledSchema(object):
     """A database under version control"""
     def __init__(self, engine, repository):
         if isinstance(repository, basestring):
             repository = Repository(repository)

rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py

➞

Show inline comments

@@ @@ -7,20 +7,22 @@ import sqlalchemy @@
 from rhodecode.lib.dbmigrate.migrate.changeset import SQLA_06
 from sqlalchemy.types import Float
 log = logging.getLogger(__name__)
 def getDiffOfModelAgainstDatabase(metadata, engine, excludeTables=None):
     """
     Return differences of model against database.
     :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
     # compared.
     if engine.dialect.name == 'sqlite':
         if 'sqlite_sequence' in db_metadata.tables:

0 comments (0 inline, 0 general)