summaryrefslogtreecommitdiff
path: root/test/orm/test_dynamic.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-04-15 20:43:17 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-04-15 20:43:17 -0400
commite155e0554a3062ce32cdb9211c16e4c787d93167 (patch)
treea69b7c2ea194465de6320ad8f349bed4ef9a1d17 /test/orm/test_dynamic.py
parent33e906638a3a99556ff9f3d4e0f63cf14c06e966 (diff)
parent04b56603cd85c4339a33d010dfea21cf39237495 (diff)
downloadsqlalchemy-e155e0554a3062ce32cdb9211c16e4c787d93167.tar.gz
merge tip + tidy
Diffstat (limited to 'test/orm/test_dynamic.py')
-rw-r--r--test/orm/test_dynamic.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/orm/test_dynamic.py b/test/orm/test_dynamic.py
index 9b57d3fd6..215a75239 100644
--- a/test/orm/test_dynamic.py
+++ b/test/orm/test_dynamic.py
@@ -191,6 +191,9 @@ class DynamicTest(_fixtures.FixtureTest, AssertsCompiledSQL):
assert o1 in i1.orders.all()
assert i1 in o1.items.all()
+ @testing.exclude('mysql', 'in',
+ ((5, 1,49), (5, 1, 50), (5, 1, 51), (5, 1, 52)),
+ 'https://bugs.launchpad.net/ubuntu/+source/mysql-5.1/+bug/706988')
def test_association_nonaliased(self):
items, Order, orders, order_items, Item = (self.tables.items,
self.classes.Order,
@@ -210,8 +213,10 @@ class DynamicTest(_fixtures.FixtureTest, AssertsCompiledSQL):
self.assert_compile(
o.items,
- "SELECT items.id AS items_id, items.description AS items_description FROM items,"
- " order_items WHERE :param_1 = order_items.order_id AND items.id = order_items.item_id"
+ "SELECT items.id AS items_id, items.description AS "
+ "items_description FROM items,"
+ " order_items WHERE :param_1 = order_items.order_id AND "
+ "items.id = order_items.item_id"
" ORDER BY order_items.item_id",
use_default_dialect=True
)