summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2009-01-12 00:06:47 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2009-01-12 00:06:47 +0000
commit91001b84c60bed9f39ec0d5e0e178dcc257ba2a0 (patch)
tree795155e422e715162e631b56138a43aad3e4777f
parent16c710a227db0dad0ad91f84bce284ab450f9174 (diff)
downloadsqlalchemy-91001b84c60bed9f39ec0d5e0e178dcc257ba2a0.tar.gz
mysql/pg sensitive fixes
-rw-r--r--test/ext/declarative.py2
-rw-r--r--test/orm/inheritance/concrete.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/test/ext/declarative.py b/test/ext/declarative.py
index 55c94aae8..29daf9c29 100644
--- a/test/ext/declarative.py
+++ b/test/ext/declarative.py
@@ -217,7 +217,7 @@ class DeclarativeTest(testing.TestBase, testing.AssertsExecutionResults):
class User(Base):
__tablename__ = 'users'
id = Column('id', Integer, primary_key=True)
- name = Column('name', String)
+ name = Column('name', String(50))
error = relation("Address")
i = Index('my_index', User.name)
diff --git a/test/orm/inheritance/concrete.py b/test/orm/inheritance/concrete.py
index 4cf7f098d..69d219ecd 100644
--- a/test/orm/inheritance/concrete.py
+++ b/test/orm/inheritance/concrete.py
@@ -434,10 +434,10 @@ class PropertyInheritanceTest(_base.MappedTest):
c1 = C()
c2 = C()
- a1 = A(some_c=c1)
- a2 = A(some_c=c2)
- b1 = B(some_c=c1)
- b2 = B(some_c=c1)
+ a1 = A(some_c=c1, aname='a1')
+ a2 = A(some_c=c2, aname='a2')
+ b1 = B(some_c=c1, bname='b1')
+ b2 = B(some_c=c1, bname='b2')
assert c2.many_a == set([a2])
assert set(c1.many_a) == set([a1, b1, b2]) # TODO: not sure whats going on with the set comparison here
@@ -454,8 +454,8 @@ class PropertyInheritanceTest(_base.MappedTest):
def go():
eq_(
+ [C(many_a=set([A(aname='a1'), B(bname='b1'), B(bname='b2')])), C(many_a=set([A(aname='a2')]))],
sess.query(C).options(eagerload(C.many_a)).order_by(C.id).all(),
- [C(many_a=set([a1, b1, b2])), C(many_a=set([a2]))]
)
self.assert_sql_count(testing.db, go, 1)