summaryrefslogtreecommitdiff
path: root/test/orm
diff options
context:
space:
mode:
Diffstat (limited to 'test/orm')
-rw-r--r--test/orm/association.py4
-rw-r--r--test/orm/cascade.py6
-rw-r--r--test/orm/compile.py6
-rw-r--r--test/orm/cycles.py16
-rw-r--r--test/orm/eagertest2.py2
-rw-r--r--test/orm/eagertest3.py4
-rw-r--r--test/orm/entity.py2
-rw-r--r--test/orm/generative.py6
-rw-r--r--test/orm/inheritance5.py2
-rw-r--r--test/orm/lazytest1.py2
-rw-r--r--test/orm/mapper.py2
-rw-r--r--test/orm/memusage.py2
-rw-r--r--test/orm/onetoone.py2
-rw-r--r--test/orm/relationships.py5
-rw-r--r--test/orm/single.py4
-rw-r--r--test/orm/unitofwork.py10
16 files changed, 37 insertions, 38 deletions
diff --git a/test/orm/association.py b/test/orm/association.py
index 755f6cf89..416cfabbb 100644
--- a/test/orm/association.py
+++ b/test/orm/association.py
@@ -6,7 +6,7 @@ from sqlalchemy import *
class AssociationTest(testbase.PersistTest):
def setUpAll(self):
global items, item_keywords, keywords, metadata, Item, Keyword, KeywordAssociation
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
items = Table('items', metadata,
Column('item_id', Integer, primary_key=True),
Column('name', String(40)),
@@ -141,7 +141,7 @@ class AssociationTest(testbase.PersistTest):
class AssociationTest2(testbase.PersistTest):
def setUpAll(self):
global table_originals, table_people, table_isauthor, metadata, Originals, People, IsAuthor
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
table_originals = Table('Originals', metadata,
Column('ID', Integer, primary_key=True),
Column('Title', String(200), nullable=False),
diff --git a/test/orm/cascade.py b/test/orm/cascade.py
index 7cb123160..16c4db40f 100644
--- a/test/orm/cascade.py
+++ b/test/orm/cascade.py
@@ -185,7 +185,7 @@ class M2OCascadeTest(testbase.AssertMixin):
def setUpAll(self):
global ctx, data, metadata, User, Pref, Extra
ctx = SessionContext(create_session)
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
extra = Table("extra", metadata,
Column("extra_id", Integer, Sequence("extra_id_seq", optional=True), primary_key=True),
Column("prefs_id", Integer, ForeignKey("prefs.prefs_id"))
@@ -263,7 +263,7 @@ class M2OCascadeTest(testbase.AssertMixin):
class M2MCascadeTest(testbase.AssertMixin):
def setUpAll(self):
global metadata, a, b, atob
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
a = Table('a', metadata,
Column('id', Integer, primary_key=True),
Column('data', String(30))
@@ -460,7 +460,7 @@ class DoubleParentOrphanTest(testbase.AssertMixin):
def setUpAll(self):
global metadata, address_table, businesses, homes
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
address_table = Table('addresses', metadata,
Column('address_id', Integer, primary_key=True),
Column('street', String(30)),
diff --git a/test/orm/compile.py b/test/orm/compile.py
index 96e56e597..61107ce8e 100644
--- a/test/orm/compile.py
+++ b/test/orm/compile.py
@@ -8,7 +8,7 @@ class CompileTest(testbase.AssertMixin):
def testone(self):
global metadata, order, employee, product, tax, orderproduct
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
order = Table('orders', metadata,
Column('id', Integer, primary_key=True),
@@ -69,7 +69,7 @@ class CompileTest(testbase.AssertMixin):
def testtwo(self):
"""test that conflicting backrefs raises an exception"""
global metadata, order, employee, product, tax, orderproduct
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
order = Table('orders', metadata,
Column('id', Integer, primary_key=True),
@@ -118,7 +118,7 @@ class CompileTest(testbase.AssertMixin):
assert str(e).index("Backrefs do not match") > -1
def testthree(self):
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
node_table = Table("node", metadata,
Column('node_id', Integer, primary_key=True),
Column('name_index', Integer, nullable=True),
diff --git a/test/orm/cycles.py b/test/orm/cycles.py
index d02a8c8d2..c53e9e846 100644
--- a/test/orm/cycles.py
+++ b/test/orm/cycles.py
@@ -26,7 +26,7 @@ class SelfReferentialTest(AssertMixin):
"""tests a self-referential mapper, with an additional list of child objects."""
def setUpAll(self):
global t1, t2, metadata
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
t1 = Table('t1', metadata,
Column('c1', Integer, Sequence('t1c1_id_seq', optional=True), primary_key=True),
Column('parent_c1', Integer, ForeignKey('t1.c1')),
@@ -128,7 +128,7 @@ class SelfReferentialNoPKTest(AssertMixin):
"""test self-referential relationship that joins on a column other than the primary key column"""
def setUpAll(self):
global table, meta
- meta = BoundMetaData(testbase.db)
+ meta = MetaData(testbase.db)
table = Table('item', meta,
Column('id', Integer, primary_key=True),
Column('uuid', String(32), unique=True, nullable=False),
@@ -173,7 +173,7 @@ class SelfReferentialNoPKTest(AssertMixin):
class InheritTestOne(AssertMixin):
def setUpAll(self):
global parent, child1, child2, meta
- meta = BoundMetaData(testbase.db)
+ meta = MetaData(testbase.db)
parent = Table("parent", meta,
Column("id", Integer, primary_key=True),
Column("parent_data", String(50)),
@@ -375,7 +375,7 @@ class BiDirectionalOneToManyTest(AssertMixin):
"""tests two mappers with a one-to-many relation to each other."""
def setUpAll(self):
global t1, t2, metadata
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
t1 = Table('t1', metadata,
Column('c1', Integer, Sequence('t1c1_id_seq', optional=True), primary_key=True),
Column('c2', Integer, ForeignKey('t2.c1'))
@@ -416,7 +416,7 @@ class BiDirectionalOneToManyTest2(AssertMixin):
"""tests two mappers with a one-to-many relation to each other, with a second one-to-many on one of the mappers"""
def setUpAll(self):
global t1, t2, t3, metadata
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
t1 = Table('t1', metadata,
Column('c1', Integer, Sequence('t1c1_id_seq', optional=True), primary_key=True),
Column('c2', Integer, ForeignKey('t2.c1')),
@@ -478,7 +478,7 @@ class OneToManyManyToOneTest(AssertMixin):
raise an exception when dependencies are sorted."""
def setUpAll(self):
global metadata
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
global person
global ball
ball = Table('ball', metadata,
@@ -770,7 +770,7 @@ class SelfReferentialPostUpdateTest(AssertMixin):
"""test using post_update on a single self-referential mapper"""
def setUpAll(self):
global metadata, node_table
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
node_table = Table('node', metadata,
Column('id', Integer, Sequence('nodeid_id_seq', optional=True), primary_key=True),
Column('path', String(50), nullable=False),
@@ -873,7 +873,7 @@ class SelfReferentialPostUpdateTest(AssertMixin):
class SelfReferentialPostUpdateTest2(AssertMixin):
def setUpAll(self):
global metadata, a_table
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
a_table = Table("a", metadata,
Column("id", Integer(), primary_key=True),
Column("fui", String()),
diff --git a/test/orm/eagertest2.py b/test/orm/eagertest2.py
index ef385df16..04de56f01 100644
--- a/test/orm/eagertest2.py
+++ b/test/orm/eagertest2.py
@@ -9,7 +9,7 @@ class EagerTest(AssertMixin):
def setUpAll(self):
global companies_table, addresses_table, invoice_table, phones_table, items_table, ctx, metadata
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
ctx = SessionContext(create_session)
companies_table = Table('companies', metadata,
diff --git a/test/orm/eagertest3.py b/test/orm/eagertest3.py
index c92444dd6..a731581d5 100644
--- a/test/orm/eagertest3.py
+++ b/test/orm/eagertest3.py
@@ -7,7 +7,7 @@ import random
class EagerTest(AssertMixin):
def setUpAll(self):
global dbmeta, owners, categories, tests, options, Owner, Category, Test, Option, false
- dbmeta = BoundMetaData(testbase.db)
+ dbmeta = MetaData(testbase.db)
# determine a literal value for "false" based on the dialect
false = Boolean().dialect_impl(testbase.db.dialect).convert_bind_param(False, testbase.db.dialect)
@@ -149,7 +149,7 @@ class EagerTest(AssertMixin):
class EagerTest2(AssertMixin):
def setUpAll(self):
global metadata, middle, left, right
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
middle = Table('middle', metadata,
Column('id', Integer, primary_key = True),
Column('data', String(50)),
diff --git a/test/orm/entity.py b/test/orm/entity.py
index 202964a69..86486cafc 100644
--- a/test/orm/entity.py
+++ b/test/orm/entity.py
@@ -12,7 +12,7 @@ class EntityTest(AssertMixin):
to have multiple primary mappers """
def setUpAll(self):
global user1, user2, address1, address2, metadata, ctx
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
ctx = SessionContext(create_session)
user1 = Table('user1', metadata,
diff --git a/test/orm/generative.py b/test/orm/generative.py
index 11daf6348..75280deed 100644
--- a/test/orm/generative.py
+++ b/test/orm/generative.py
@@ -12,7 +12,7 @@ class GenerativeQueryTest(PersistTest):
def setUpAll(self):
self.install_threadlocal()
global foo, metadata
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
foo = Table('foo', metadata,
Column('id', Integer, Sequence('foo_id_seq'), primary_key=True),
Column('bar', Integer),
@@ -111,7 +111,7 @@ class GenerativeTest2(PersistTest):
def setUpAll(self):
self.install_threadlocal()
global metadata, table1, table2
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
table1 = Table('Table1', metadata,
Column('id', Integer, primary_key=True),
)
@@ -205,7 +205,7 @@ class CaseSensitiveTest(PersistTest):
def setUpAll(self):
self.install_threadlocal()
global metadata, table1, table2
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
table1 = Table('Table1', metadata,
Column('ID', Integer, primary_key=True),
)
diff --git a/test/orm/inheritance5.py b/test/orm/inheritance5.py
index b0a905f33..cf7224fa4 100644
--- a/test/orm/inheritance5.py
+++ b/test/orm/inheritance5.py
@@ -593,7 +593,7 @@ class GenerativeTest(testbase.AssertMixin):
# +--------------------------------------- has a ------+
global metadata, status, people, engineers, managers, cars
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
# table definitions
status = Table('status', metadata,
Column('status_id', Integer, primary_key=True),
diff --git a/test/orm/lazytest1.py b/test/orm/lazytest1.py
index 9f2d53e9d..2cabac3a2 100644
--- a/test/orm/lazytest1.py
+++ b/test/orm/lazytest1.py
@@ -7,7 +7,7 @@ import datetime
class LazyTest(AssertMixin):
def setUpAll(self):
global info_table, data_table, rel_table, metadata
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
info_table = Table('infos', metadata,
Column('pk', Integer, primary_key=True),
Column('info', String))
diff --git a/test/orm/mapper.py b/test/orm/mapper.py
index 88b474e24..63af53b96 100644
--- a/test/orm/mapper.py
+++ b/test/orm/mapper.py
@@ -38,7 +38,7 @@ class MapperTest(MapperSuperTest):
def testunicodeget(self):
"""test that Query.get properly sets up the type for the bind parameter. using unicode would normally fail
on postgres, mysql and oracle unless it is converted to an encoded string"""
- metadata = BoundMetaData(db)
+ metadata = MetaData(db)
table = Table('foo', metadata,
Column('id', Unicode(10), primary_key=True),
Column('data', Unicode(40)))
diff --git a/test/orm/memusage.py b/test/orm/memusage.py
index b456a1abb..4e961a6d7 100644
--- a/test/orm/memusage.py
+++ b/test/orm/memusage.py
@@ -33,7 +33,7 @@ class MapperCleanoutTest(testbase.AssertMixin):
assert True
def do_test(self):
- metadata = BoundMetaData(engine)
+ metadata = MetaData(engine)
table1 = Table("mytable", metadata,
Column('col1', Integer, primary_key=True),
diff --git a/test/orm/onetoone.py b/test/orm/onetoone.py
index 525c8db7e..6ac7c514d 100644
--- a/test/orm/onetoone.py
+++ b/test/orm/onetoone.py
@@ -25,7 +25,7 @@ class Port(object):
class O2OTest(testbase.AssertMixin):
def setUpAll(self):
global jack, port, metadata, ctx
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
ctx = SessionContext(create_session)
jack = Table('jack', metadata,
Column('id', Integer, primary_key=True),
diff --git a/test/orm/relationships.py b/test/orm/relationships.py
index 5f53af080..6f652e692 100644
--- a/test/orm/relationships.py
+++ b/test/orm/relationships.py
@@ -2,7 +2,6 @@ import testbase
import unittest, sys, datetime
db = testbase.db
-#db.
from sqlalchemy import *
@@ -106,7 +105,7 @@ class RelationTest2(testbase.PersistTest):
is 'joined to itself'."""
def setUpAll(self):
global metadata, company_tbl, employee_tbl
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
company_tbl = Table('company', metadata,
Column('company_id', Integer, primary_key=True),
@@ -221,7 +220,7 @@ class RelationTest3(testbase.PersistTest):
def setUpAll(self):
global jobs, pageversions, pages, metadata, Job, Page, PageVersion, PageComment
import datetime
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
jobs = Table("jobs", metadata,
Column("jobno", Unicode(15), primary_key=True),
Column("created", DateTime, nullable=False, default=datetime.datetime.now),
diff --git a/test/orm/single.py b/test/orm/single.py
index d78084fe1..31a90da21 100644
--- a/test/orm/single.py
+++ b/test/orm/single.py
@@ -3,7 +3,7 @@ import testbase
class SingleInheritanceTest(testbase.AssertMixin):
def setUpAll(self):
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
global employees_table
employees_table = Table('employees', metadata,
Column('employee_id', Integer, primary_key=True),
@@ -60,4 +60,4 @@ class SingleInheritanceTest(testbase.AssertMixin):
assert session.query(JuniorEngineer).select() == [e2]
if __name__ == '__main__':
- testbase.main() \ No newline at end of file
+ testbase.main()
diff --git a/test/orm/unitofwork.py b/test/orm/unitofwork.py
index bf40a49f7..6ba3f8c4b 100644
--- a/test/orm/unitofwork.py
+++ b/test/orm/unitofwork.py
@@ -164,7 +164,7 @@ class UnicodeTest(UnitOfWorkTest):
def setUpAll(self):
UnitOfWorkTest.setUpAll(self)
global metadata, uni_table, uni_table2
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
uni_table = Table('uni_test', metadata,
Column('id', Integer, Sequence("uni_test_id_seq", optional=True), primary_key=True),
Column('txt', Unicode(50), unique=True))
@@ -215,7 +215,7 @@ class MutableTypesTest(UnitOfWorkTest):
def setUpAll(self):
UnitOfWorkTest.setUpAll(self)
global metadata, table
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
table = Table('mutabletest', metadata,
Column('id', Integer, Sequence('mutableidseq', optional=True), primary_key=True),
Column('data', PickleType),
@@ -421,7 +421,7 @@ class ForeignPKTest(UnitOfWorkTest):
def setUpAll(self):
UnitOfWorkTest.setUpAll(self)
global metadata, people, peoplesites
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
people = Table("people", metadata,
Column('person', String(10), primary_key=True),
Column('firstname', String(10)),
@@ -462,7 +462,7 @@ class PassiveDeletesTest(UnitOfWorkTest):
def setUpAll(self):
UnitOfWorkTest.setUpAll(self)
global metadata, mytable,myothertable
- metadata = BoundMetaData(testbase.db)
+ metadata = MetaData(testbase.db)
mytable = Table('mytable', metadata,
Column('id', Integer, primary_key=True),
Column('data', String(30)),
@@ -1427,7 +1427,7 @@ class SaveTest2(UnitOfWorkTest):
ctx.current.clear()
clear_mappers()
global meta, users, addresses
- meta = BoundMetaData(db)
+ meta = MetaData(db)
users = Table('users', meta,
Column('user_id', Integer, Sequence('user_id_seq', optional=True), primary_key = True),
Column('user_name', String(20)),
View Lorry Controller Status