From 8fc5005dfe3eb66a46470ad8a8c7b95fc4d6bdca Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 6 Aug 2009 21:11:27 +0000 Subject: merge 0.6 series to trunk. --- test/sql/test_selectable.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/sql/test_selectable.py') diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py index b0501c913..95ca0d17b 100644 --- a/test/sql/test_selectable.py +++ b/test/sql/test_selectable.py @@ -416,7 +416,7 @@ class ReduceTest(TestBase, AssertsExecutionResults): Column('magazine_page_id', Integer, ForeignKey('magazine_page.page_id'), primary_key=True), ) - # this is essentially the union formed by the ORM's polymorphic_union function. + # this is essentially the union formed by the ORM's polymorphic_union function. # we define two versions with different ordering of selects. # the first selectable has the "real" column classified_page.magazine_page_id @@ -432,7 +432,6 @@ class ReduceTest(TestBase, AssertsExecutionResults): magazine_page_table.c.page_id, cast(null(), Integer).label('magazine_page_id') ]).select_from(page_table.join(magazine_page_table)), - ).alias('pjoin') eq_( -- cgit v1.2.1