x/sqlalchemy-migrate
Code Issues Proposed changes

r1035@denkpolster: jan | 2008-04-02 14:39:05 +0200

Browse Source 
- fix unit tests with py-0.9.1, fixes #17
This commit is contained in:
jan.dittberner 2008-04-02 12:39:41 +00:00
parent 1eadc362f6
commit efcd7d2f63
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/changeset/test_changeset.py
View File

@ -17,9 +17,8 @@ class TestAddDropColumn(fixture.DB):
table_int = 0 table_int = 0
def setUp(self): def setUp(self):
if self.url.startswith('sqlite://'): fixture.DB.setUp(self)
self.engine = create_engine(self.url) self._connect(self.url)
#self.engine.echo=True
self.meta.clear() self.meta.clear()
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),
@ -188,6 +187,8 @@ class TestRename(fixture.DB):
meta = MetaData() meta = MetaData()
def setUp(self): def setUp(self):
fixture.DB.setUp(self)
self._connect(self.url)
self.meta.bind = self.engine #self.meta.connect(self.engine) self.meta.bind = self.engine #self.meta.connect(self.engine)
@fixture.usedb() @fixture.usedb()
@ -276,6 +277,8 @@ class TestColumnChange(fixture.DB):
def setUp(self): def setUp(self):
fixture.DB.setUp(self) fixture.DB.setUp(self)
self._connect(self.url)
#self.engine.echo=True
self.meta = MetaData(self.engine) self.meta = MetaData(self.engine)
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),
@ -289,16 +292,15 @@ class TestColumnChange(fixture.DB):
# SQLite: database schema has changed # SQLite: database schema has changed
if not self.url.startswith('sqlite://'): if not self.url.startswith('sqlite://'):
raise raise
#self.engine.echo=True
def tearDown(self): def tearDown(self):
#self.engine.echo=False if self.table.exists():
if self.table:
try: try:
self.table.drop() self.table.drop(self.engine)
except sqlalchemy.exceptions.SQLError,e: except sqlalchemy.exceptions.SQLError,e:
# SQLite: database schema has changed # SQLite: database schema has changed
if not self.url.startswith('sqlite://'): if not self.url.startswith('sqlite://'):
raise raise
#self.engine.echo=False
fixture.DB.tearDown(self) fixture.DB.tearDown(self)
@fixture.usedb(supported='sqlite') @fixture.usedb(supported='sqlite')

2
test/changeset/test_constraint.py
View File

@ -14,6 +14,7 @@ class TestConstraint(fixture.DB):
fixture.DB.tearDown(self) fixture.DB.tearDown(self)
def _create_table(self): def _create_table(self):
self._connect(self.url)
self.meta = MetaData(self.engine) self.meta = MetaData(self.engine)
self.table = Table('mytable',self.meta, self.table = Table('mytable',self.meta,
Column('id',Integer), Column('id',Integer),
@ -106,6 +107,7 @@ class TestAutoname(fixture.DB):
def setUp(self): def setUp(self):
fixture.DB.setUp(self) fixture.DB.setUp(self)
self._connect(self.url)
self.meta = MetaData(self.engine) self.meta = MetaData(self.engine)
self.table = Table('mytable',self.meta, self.table = Table('mytable',self.meta,
Column('id',Integer), Column('id',Integer),

1
test/versioning/test_schemadiff.py
View File

@ -24,6 +24,7 @@ class TestSchemaDiff(fixture.DB):
def setUp(self): def setUp(self):
fixture.DB.setUp(self) fixture.DB.setUp(self)
self._connect(self.url)
self.meta = MetaData(self.engine) self.meta = MetaData(self.engine)
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),