diff options
Diffstat (limited to 'test/sql')
| -rw-r--r-- | test/sql/constraints.py | 2 | ||||
| -rw-r--r-- | test/sql/defaults.py | 10 | ||||
| -rw-r--r-- | test/sql/query.py | 14 | ||||
| -rw-r--r-- | test/sql/quote.py | 6 | ||||
| -rw-r--r-- | test/sql/rowcount.py | 2 | ||||
| -rw-r--r-- | test/sql/testtypes.py | 4 | ||||
| -rw-r--r-- | test/sql/unicode.py | 4 |
7 files changed, 21 insertions, 21 deletions
diff --git a/test/sql/constraints.py b/test/sql/constraints.py index d695e824c..7e1172850 100644 --- a/test/sql/constraints.py +++ b/test/sql/constraints.py @@ -6,7 +6,7 @@ class ConstraintTest(testbase.AssertMixin): def setUp(self): global metadata - metadata = BoundMetaData(testbase.db) + metadata = MetaData(testbase.db) def tearDown(self): metadata.drop_all() diff --git a/test/sql/defaults.py b/test/sql/defaults.py index 0bc1a6b2e..331fac429 100644 --- a/test/sql/defaults.py +++ b/test/sql/defaults.py @@ -127,7 +127,7 @@ class DefaultTest(PersistTest): class AutoIncrementTest(PersistTest): @testbase.supported('postgres', 'mysql') def testnonautoincrement(self): - meta = BoundMetaData(testbase.db) + meta = MetaData(testbase.db) nonai_table = Table("aitest", meta, Column('id', Integer, autoincrement=False, primary_key=True), Column('data', String(20))) @@ -147,7 +147,7 @@ class AutoIncrementTest(PersistTest): nonai_table.drop() def testwithautoincrement(self): - meta = BoundMetaData(testbase.db) + meta = MetaData(testbase.db) table = Table("aitest", meta, Column('id', Integer, primary_key=True), Column('data', String(20))) @@ -159,7 +159,7 @@ class AutoIncrementTest(PersistTest): table.drop() def testfetchid(self): - meta = BoundMetaData(testbase.db) + meta = MetaData(testbase.db) table = Table("aitest", meta, Column('id', Integer, primary_key=True), Column('data', String(20))) @@ -167,7 +167,7 @@ class AutoIncrementTest(PersistTest): try: # simulate working on a table that doesn't already exist - meta2 = BoundMetaData(testbase.db) + meta2 = MetaData(testbase.db) table2 = Table("aitest", meta2, Column('id', Integer, primary_key=True), Column('data', String(20))) @@ -189,7 +189,7 @@ class SequenceTest(PersistTest): @testbase.supported('postgres', 'oracle') def setUpAll(self): global cartitems, sometable, metadata - metadata = BoundMetaData(testbase.db) + metadata = MetaData(testbase.db) cartitems = Table("cartitems", metadata, Column("cart_id", Integer, Sequence('cart_id_seq'), primary_key=True), Column("description", String(40)), diff --git a/test/sql/query.py b/test/sql/query.py index 2fe5715c2..bf7817770 100644 --- a/test/sql/query.py +++ b/test/sql/query.py @@ -13,7 +13,7 @@ class QueryTest(PersistTest): def setUpAll(self): global users, addresses, metadata - metadata = BoundMetaData(testbase.db) + metadata = MetaData(testbase.db) users = Table('query_users', metadata, Column('user_id', INT, primary_key = True), Column('user_name', VARCHAR(20)), @@ -301,7 +301,7 @@ class QueryTest(PersistTest): def test_update_functions(self): """test sending functions and SQL expressions to the VALUES and SET clauses of INSERT/UPDATE instances, and that column-level defaults get overridden""" - meta = BoundMetaData(testbase.db) + meta = MetaData(testbase.db) t = Table('t1', meta, Column('id', Integer, Sequence('t1idseq', optional=True), primary_key=True), Column('value', Integer) @@ -383,7 +383,7 @@ class QueryTest(PersistTest): @testbase.unsupported('oracle', 'firebird') def test_column_accessor_shadow(self): - meta = BoundMetaData(testbase.db) + meta = MetaData(testbase.db) shadowed = Table('test_shadowed', meta, Column('shadow_id', INT, primary_key = True), Column('shadow_name', VARCHAR(20)), @@ -413,7 +413,7 @@ class QueryTest(PersistTest): @testbase.supported('mssql') def test_fetchid_trigger(self): - meta = BoundMetaData(testbase.db) + meta = MetaData(testbase.db) t1 = Table('t1', meta, Column('id', Integer, Sequence('fred', 100, 1), primary_key=True), Column('descr', String(200))) @@ -439,7 +439,7 @@ class QueryTest(PersistTest): @testbase.supported('mssql') def test_insertid_schema(self): - meta = BoundMetaData(testbase.db) + meta = MetaData(testbase.db) con = testbase.db.connect() con.execute('create schema paj') tbl = Table('test', meta, Column('id', Integer, primary_key=True), schema='paj') @@ -505,7 +505,7 @@ class CompoundTest(PersistTest): different databases.""" def setUpAll(self): global metadata, t1, t2, t3 - metadata = BoundMetaData(testbase.db) + metadata = MetaData(testbase.db) t1 = Table('t1', metadata, Column('col1', Integer, Sequence('t1pkseq'), primary_key=True), Column('col2', String(30)), @@ -619,7 +619,7 @@ class CompoundTest(PersistTest): class OperatorTest(PersistTest): def setUpAll(self): global metadata, flds - metadata = BoundMetaData(testbase.db) + metadata = MetaData(testbase.db) flds = Table('flds', metadata, Column('idcol', Integer, Sequence('t1pkseq'), primary_key=True), Column('intcol', Integer), diff --git a/test/sql/quote.py b/test/sql/quote.py index 5259437fc..bc40d52ee 100644 --- a/test/sql/quote.py +++ b/test/sql/quote.py @@ -8,7 +8,7 @@ class QuoteTest(PersistTest): # such as: spaces, quote characters, punctuation characters, set up tests for those as # well. global table1, table2, table3 - metadata = BoundMetaData(testbase.db) + metadata = MetaData(testbase.db) table1 = Table('WorstCase1', metadata, Column('lowercase', Integer, primary_key=True), Column('UPPERCASE', Integer), @@ -46,7 +46,7 @@ class QuoteTest(PersistTest): assert(res2==[(1,2,3),(2,2,3),(4,3,2)]) def testreflect(self): - meta2 = BoundMetaData(testbase.db) + meta2 = MetaData(testbase.db) t2 = Table('WorstCase2', meta2, autoload=True, quote=True) assert t2.c.has_key('MixedCase') @@ -119,7 +119,7 @@ class QuoteTest(PersistTest): Column('MixedCase', Integer)) # first test case sensitive tables migrating via tometadata - meta = BoundMetaData(testbase.db, case_sensitive=False) + meta = MetaData(testbase.db, case_sensitive=False) lc_table1 = table1.tometadata(meta) lc_table2 = table2.tometadata(meta) assert lc_table1.case_sensitive is False diff --git a/test/sql/rowcount.py b/test/sql/rowcount.py index 95cab898c..df6a2a883 100644 --- a/test/sql/rowcount.py +++ b/test/sql/rowcount.py @@ -4,7 +4,7 @@ import testbase class FoundRowsTest(testbase.AssertMixin): """tests rowcount functionality""" def setUpAll(self): - metadata = BoundMetaData(testbase.db) + metadata = MetaData(testbase.db) global employees_table diff --git a/test/sql/testtypes.py b/test/sql/testtypes.py index c3dff5272..cf5ce1f1a 100644 --- a/test/sql/testtypes.py +++ b/test/sql/testtypes.py @@ -360,7 +360,7 @@ class DateTest(AssertMixin): class IntervalTest(AssertMixin): def setUpAll(self): global interval_table, metadata - metadata = BoundMetaData(testbase.db) + metadata = MetaData(testbase.db) interval_table = Table("intervaltable", metadata, Column("id", Integer, primary_key=True), Column("interval", Interval), @@ -378,7 +378,7 @@ class IntervalTest(AssertMixin): class BooleanTest(AssertMixin): def setUpAll(self): global bool_table - metadata = BoundMetaData(testbase.db) + metadata = MetaData(testbase.db) bool_table = Table('booltest', metadata, Column('id', Integer, primary_key=True), Column('value', Boolean)) diff --git a/test/sql/unicode.py b/test/sql/unicode.py index 65a7cce0d..7ce42bf4c 100644 --- a/test/sql/unicode.py +++ b/test/sql/unicode.py @@ -39,7 +39,7 @@ class UnicodeSchemaTest(testbase.PersistTest): t1.insert().execute({u'méil':2, u'éXXm':7}) t2.insert().execute({'a':2, 'b':2}) - meta = BoundMetaData(testbase.db) + meta = MetaData(testbase.db) tt1 = Table(t1.name, meta, autoload=True) tt2 = Table(t2.name, meta, autoload=True) tt1.insert().execute({u'méil':1, u'éXXm':5}) @@ -76,4 +76,4 @@ class UnicodeSchemaTest(testbase.PersistTest): assert new_a1.t2s[0].a == b1.a if __name__ == '__main__': - testbase.main()
\ No newline at end of file + testbase.main() |