x/sqlalchemy-migrate
Code Issues Proposed changes

fix deprecation warning by using MetaData.reflect

Browse Source
This commit is contained in:
Jan Dittberner 2013-02-09 13:02:59 +01:00
parent 2e26236baa
commit 195f95550b
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
migrate/tests/fixture/database.py
View File

@ -128,7 +128,8 @@ class DB(Base):
def _setup(self, url): def _setup(self, url):
self._connect(url) self._connect(url)
# make sure there are no tables lying around # make sure there are no tables lying around
meta = MetaData(self.engine, reflect=True) meta = MetaData(self.engine)
meta.reflect()
meta.drop_all() meta.drop_all()
def _teardown(self): def _teardown(self):

9
migrate/tests/versioning/test_genmodel.py
View File

@ -18,9 +18,11 @@ class TestSchemaDiff(fixture.DB):
def _setup(self, url): def _setup(self, url):
super(TestSchemaDiff, self)._setup(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.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, self.table = Table(self.table_name, self.meta,
Column('id',Integer(), primary_key=True), Column('id',Integer(), primary_key=True),
Column('name', UnicodeText()), Column('name', UnicodeText()),
@ -29,7 +31,8 @@ class TestSchemaDiff(fixture.DB):
def _teardown(self): def _teardown(self):
if self.table.exists(): if self.table.exists():
self.meta = MetaData(self.engine, reflect=True) self.meta = MetaData(self.engine)
self.meta.reflect()
self.meta.drop_all() self.meta.drop_all()
super(TestSchemaDiff, self)._teardown() super(TestSchemaDiff, self)._teardown()

2
migrate/tests/versioning/test_shell.py
View File

@ -461,7 +461,7 @@ class TestShellDatabase(Shell, DB):
old_model_module = 'migrate.tests.fixture.models:meta_old_rundiffs' old_model_module = 'migrate.tests.fixture.models:meta_old_rundiffs'
# Create empty repository. # Create empty repository.
self.meta = MetaData(self.engine, reflect=True) self.meta = MetaData(self.engine)
self.meta.reflect() self.meta.reflect()
self.meta.drop_all() # in case junk tables are lying around in the test database self.meta.drop_all() # in case junk tables are lying around in the test database

3
migrate/versioning/schemadiff.py
View File

@ -16,7 +16,8 @@ def getDiffOfModelAgainstDatabase(metadata, engine, excludeTables=None):
:return: object which will evaluate to :keyword:`True` if there \ :return: object which will evaluate to :keyword:`True` if there \
are differences else :keyword:`False`. 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 # sqlite will include a dynamically generated 'sqlite_sequence' table if
# there are autoincrement sequences in the database; this should not be # there are autoincrement sequences in the database; this should not be