From 9fe69cb503de4bcbace8d74b14dd6d096d457e72 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 3 Jan 2009 02:42:34 +0000 Subject: - Fixed some deep "column correspondence" issues which could impact a Query made against a selectable containing multiple versions of the same table, as well as unions and similar which contained the same table columns in different column positions at different levels. [ticket:1268] --- test/sql/selectable.py | 50 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 17 deletions(-) (limited to 'test/sql') diff --git a/test/sql/selectable.py b/test/sql/selectable.py index eb8bc861f..e9ed5f565 100755 --- a/test/sql/selectable.py +++ b/test/sql/selectable.py @@ -1,6 +1,4 @@ -"""tests that various From objects properly export their columns, as well as -useable primary keys and foreign keys. Full relational algebra depends on -every selectable unit behaving nicely with others..""" +"""Test various algorithmic properties of selectables.""" import testenv; testenv.configure_for_tests() from sqlalchemy import * @@ -27,7 +25,7 @@ table2 = Table('table2', metadata, ) class SelectableTest(TestBase, AssertsExecutionResults): - def test_distance(self): + def test_distance_on_labels(self): # same column three times s = select([table1.c.col1.label('c2'), table1.c.col1, table1.c.col1.label('c1')]) @@ -36,6 +34,17 @@ class SelectableTest(TestBase, AssertsExecutionResults): assert s.corresponding_column(s.c.col1) is s.c.col1 assert s.corresponding_column(s.c.c1) is s.c.c1 + def test_distance_on_aliases(self): + a1 = table1.alias('a1') + + for s in ( + select([a1, table1], use_labels=True), + select([table1, a1], use_labels=True) + ): + assert s.corresponding_column(table1.c.col1) is s.c.table1_col1 + assert s.corresponding_column(a1.c.col1) is s.c.a1_col1 + + def test_join_against_self(self): jj = select([table1.c.col1.label('bar_col1')]) jjj = join(table1, jj, table1.c.col1==jj.c.bar_col1) @@ -45,10 +54,7 @@ class SelectableTest(TestBase, AssertsExecutionResults): assert jjj.corresponding_column(jj.c.bar_col1) is jjj.c.bar_col1 - # test alias of the join, targets the column with the least - # "distance" between the requested column and the returned column - # (i.e. there is less indirection between j2.c.table1_col1 and table1.c.col1, than - # there is from j2.c.bar_col1 to table1.c.col1) + # test alias of the join j2 = jjj.alias('foo') assert j2.corresponding_column(table1.c.col1) is j2.c.table1_col1 @@ -66,7 +72,6 @@ class SelectableTest(TestBase, AssertsExecutionResults): assert jjj.corresponding_column(jjj.c.table1_col1) is jjj.c.table1_col1 j2 = jjj.alias('foo') - print j2.corresponding_column(jjj.c.table1_col1) assert j2.corresponding_column(jjj.c.table1_col1) is j2.c.table1_col1 assert jjj.corresponding_column(jj.c.bar_col1) is jj.c.bar_col1 @@ -87,14 +92,29 @@ class SelectableTest(TestBase, AssertsExecutionResults): ) s1 = table1.select(use_labels=True) s2 = table2.select(use_labels=True) - print ["%d %s" % (id(c),c.key) for c in u.c] c = u.corresponding_column(s1.c.table1_col2) - print "%d %s" % (id(c), c.key) - print id(u.corresponding_column(s1.c.table1_col2).table) - print id(u.c.col2.table) assert u.corresponding_column(s1.c.table1_col2) is u.c.col2 assert u.corresponding_column(s2.c.table2_col2) is u.c.col2 + def test_union_precedence(self): + # conflicting column correspondence should be resolved based on + # the order of the select()s in the union + + s1 = select([table1.c.col1, table1.c.col2]) + s2 = select([table1.c.col2, table1.c.col1]) + s3 = select([table1.c.col3, table1.c.colx]) + s4 = select([table1.c.colx, table1.c.col3]) + + u1 = union(s1, s2) + assert u1.corresponding_column(table1.c.col1) is u1.c.col1 + assert u1.corresponding_column(table1.c.col2) is u1.c.col2 + + u1 = union(s1, s2, s3, s4) + assert u1.corresponding_column(table1.c.col1) is u1.c.col1 + assert u1.corresponding_column(table1.c.col2) is u1.c.col2 + assert u1.corresponding_column(table1.c.colx) is u1.c.col2 + assert u1.corresponding_column(table1.c.col3) is u1.c.col1 + def test_singular_union(self): u = union(select([table1.c.col1, table1.c.col2, table1.c.col3]), select([table1.c.col1, table1.c.col2, table1.c.col3])) @@ -153,7 +173,6 @@ class SelectableTest(TestBase, AssertsExecutionResults): def test_select_labels(self): a = table1.select(use_labels=True) - print str(a.select()) j = join(a, table2) criterion = a.c.table1_col1 == table2.c.col2 @@ -196,9 +215,6 @@ class SelectableTest(TestBase, AssertsExecutionResults): j3 = a.join(j2, j2.c.aid==a.c.id) j4 = select([j3]).alias('foo') - print j4 - print j4.corresponding_column(j2.c.aid) - print j4.c.aid assert j4.corresponding_column(j2.c.aid) is j4.c.aid assert j4.corresponding_column(a.c.id) is j4.c.id -- cgit v1.2.1