sync sqlalchemy migrate with latest changes

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

@@ -7,7 +7,7 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
@@ -20,6 +20,7 from rhodecode.lib.dbmigrate.migrate.ver
 
 log = logging.getLogger(__name__)
 
+
 class ControlledSchema(object):
     """A database under version control"""
 

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

@@ -10,6 +10,7 from sqlalchemy.types import Float
 
 log = logging.getLogger(__name__)
 
+
 def getDiffOfModelAgainstDatabase(metadata, engine, excludeTables=None):
     """
     Return differences of model against database.
@@ -17,7 +18,8 def getDiffOfModelAgainstDatabase(metada
     :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