summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jan.dittberner@gmail.com>2013-02-09 13:02:59 +0100
committerJan Dittberner <jan.dittberner@gmail.com>2013-02-09 13:02:59 +0100
commit195f95550bade1c63be88fae66ced2a7700453c8 (patch)
treeeaeeafa9da20a889203c4c04161257a6479b5e0a
parent2e26236baacdcbcdce69172604f22b352ccbdf47 (diff)
downloadsqalchemy-migrate-195f95550bade1c63be88fae66ced2a7700453c8.tar.gz
fix deprecation warning by using MetaData.reflect
-rw-r--r--migrate/tests/fixture/database.py3
-rw-r--r--migrate/tests/versioning/test_genmodel.py9
-rw-r--r--migrate/tests/versioning/test_shell.py2
-rw-r--r--migrate/versioning/schemadiff.py3
4 files changed, 11 insertions, 6 deletions
diff --git a/migrate/tests/fixture/database.py b/migrate/tests/fixture/database.py
index e6e410a..b9eb0ca 100644
--- a/migrate/tests/fixture/database.py
+++ b/migrate/tests/fixture/database.py
@@ -128,7 +128,8 @@ class DB(Base):
def _setup(self, url):
self._connect(url)
# make sure there are no tables lying around
- meta = MetaData(self.engine, reflect=True)
+ meta = MetaData(self.engine)
+ meta.reflect()
meta.drop_all()
def _teardown(self):
diff --git a/migrate/tests/versioning/test_genmodel.py b/migrate/tests/versioning/test_genmodel.py
index eeefe8a..db35aa4 100644
--- a/migrate/tests/versioning/test_genmodel.py
+++ b/migrate/tests/versioning/test_genmodel.py
@@ -18,9 +18,11 @@ class TestSchemaDiff(fixture.DB):
def _setup(self, url):
super(TestSchemaDiff, self)._setup(url)
- self.meta = MetaData(self.engine, reflect=True)
+ self.meta = MetaData(self.engine)
+ self.meta.reflect()
self.meta.drop_all() # in case junk tables are lying around in the test database
- self.meta = MetaData(self.engine, reflect=True) # needed if we just deleted some tables
+ self.meta = MetaData(self.engine)
+ self.meta.reflect() # needed if we just deleted some tables
self.table = Table(self.table_name, self.meta,
Column('id',Integer(), primary_key=True),
Column('name', UnicodeText()),
@@ -29,7 +31,8 @@ class TestSchemaDiff(fixture.DB):
def _teardown(self):
if self.table.exists():
- self.meta = MetaData(self.engine, reflect=True)
+ self.meta = MetaData(self.engine)
+ self.meta.reflect()
self.meta.drop_all()
super(TestSchemaDiff, self)._teardown()
diff --git a/migrate/tests/versioning/test_shell.py b/migrate/tests/versioning/test_shell.py
index e24c432..4b89c28 100644
--- a/migrate/tests/versioning/test_shell.py
+++ b/migrate/tests/versioning/test_shell.py
@@ -461,7 +461,7 @@ class TestShellDatabase(Shell, DB):
old_model_module = 'migrate.tests.fixture.models:meta_old_rundiffs'
# Create empty repository.
- self.meta = MetaData(self.engine, reflect=True)
+ self.meta = MetaData(self.engine)
self.meta.reflect()
self.meta.drop_all() # in case junk tables are lying around in the test database
diff --git a/migrate/versioning/schemadiff.py b/migrate/versioning/schemadiff.py
index f8d77e4..689703b 100644
--- a/migrate/versioning/schemadiff.py
+++ b/migrate/versioning/schemadiff.py
@@ -16,7 +16,8 @@ def getDiffOfModelAgainstDatabase(metadata, engine, excludeTables=None):
: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