From: Mike Bayer Date: Tue, 21 Sep 2010 15:12:33 +0000 (-0400) Subject: use default dialect for compile tests X-Git-Tag: rel_0_6_5~52 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ec3e077e59c69282e834ac6cd6108e4f27acfca;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git use default dialect for compile tests --- diff --git a/test/orm/test_query.py b/test/orm/test_query.py index 22e5ac84fc..b52716198c 100644 --- a/test/orm/test_query.py +++ b/test/orm/test_query.py @@ -3620,7 +3620,8 @@ class CustomJoinTest(QueryTest): class SelfRefMixedTest(_base.MappedTest, AssertsCompiledSQL): run_setup_mappers = 'once' - + __dialect__ = default.DefaultDialect() + @classmethod def define_tables(cls, metadata): nodes = Table('nodes', metadata, @@ -3871,33 +3872,38 @@ class SelfReferentialTest(_base.MappedTest, AssertsCompiledSQL): self.assert_compile( join(Node, n1, 'children').join(n2, 'children'), - "nodes JOIN nodes AS nodes_1 ON nodes.id = nodes_1.parent_id JOIN nodes AS nodes_2 ON nodes_1.id = nodes_2.parent_id" + "nodes JOIN nodes AS nodes_1 ON nodes.id = nodes_1.parent_id JOIN nodes AS nodes_2 ON nodes_1.id = nodes_2.parent_id", + use_default_dialect=True ) self.assert_compile( join(Node, n1, Node.children).join(n2, n1.children), - "nodes JOIN nodes AS nodes_1 ON nodes.id = nodes_1.parent_id JOIN nodes AS nodes_2 ON nodes_1.id = nodes_2.parent_id" + "nodes JOIN nodes AS nodes_1 ON nodes.id = nodes_1.parent_id JOIN nodes AS nodes_2 ON nodes_1.id = nodes_2.parent_id", + use_default_dialect=True ) # the join_to_left=False here is unfortunate. the default on this flag should # be False. self.assert_compile( join(Node, n1, Node.children).join(n2, Node.children, join_to_left=False), - "nodes JOIN nodes AS nodes_1 ON nodes.id = nodes_1.parent_id JOIN nodes AS nodes_2 ON nodes.id = nodes_2.parent_id" + "nodes JOIN nodes AS nodes_1 ON nodes.id = nodes_1.parent_id JOIN nodes AS nodes_2 ON nodes.id = nodes_2.parent_id", + use_default_dialect=True ) self.assert_compile( sess.query(Node).join((n1, Node.children)).join((n2, n1.children)), "SELECT nodes.id AS nodes_id, nodes.parent_id AS nodes_parent_id, nodes.data AS " "nodes_data FROM nodes JOIN nodes AS nodes_1 ON nodes.id = nodes_1.parent_id " - "JOIN nodes AS nodes_2 ON nodes_1.id = nodes_2.parent_id" + "JOIN nodes AS nodes_2 ON nodes_1.id = nodes_2.parent_id", + use_default_dialect=True ) self.assert_compile( sess.query(Node).join((n1, Node.children)).join((n2, Node.children)), "SELECT nodes.id AS nodes_id, nodes.parent_id AS nodes_parent_id, nodes.data AS " "nodes_data FROM nodes JOIN nodes AS nodes_1 ON nodes.id = nodes_1.parent_id " - "JOIN nodes AS nodes_2 ON nodes.id = nodes_2.parent_id" + "JOIN nodes AS nodes_2 ON nodes.id = nodes_2.parent_id", + use_default_dialect=True ) node = sess.query(Node).select_from(join(Node, n1, 'children')).filter(n1.data=='n122').first()