[SQL-CVS] r2628 - SQLObject/trunk/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2007-05-02 12:02:29 -0600 (Wed, 02 May 2007)
New Revision: 2628

Modified:
   SQLObject/trunk/sqlobject/tests/test_aliases.py
Log:
Added a test for aliases in JOINs.


Modified: SQLObject/trunk/sqlobject/tests/test_aliases.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_aliases.py	2007-05-02 18:01:53 UTC (rev 2627)
+++ SQLObject/trunk/sqlobject/tests/test_aliases.py	2007-05-02 18:02:29 UTC (rev 2628)
@@ -11,12 +11,11 @@
     parent = StringCol()
 
 def test_1syntax():
-    return # DEPRECATED this test because table ordering in FROM clause is not stable.
     setupClass(JoinAlias)
     alias = Alias(JoinAlias)
     select = JoinAlias.select(JoinAlias.q.parent == alias.q.name)
     assert str(select) == \
-        "SELECT join_alias.id, join_alias.name, join_alias.parent FROM join_alias  join_alias_alias1, join_alias WHERE ((join_alias.parent) = (join_alias_alias1.name))"
+        "SELECT join_alias.id, join_alias.name, join_alias.parent FROM join_alias, join_alias  join_alias_alias1 WHERE ((join_alias.parent) = (join_alias_alias1.name))"
 
 def test_2perform_join():
     setupClass(JoinAlias)
@@ -26,3 +25,12 @@
     alias = Alias(JoinAlias)
     select = JoinAlias.select(JoinAlias.q.parent == alias.q.name)
     assert select.count() == 2
+
+def test_3joins():
+    setupClass(JoinAlias)
+    alias = Alias(JoinAlias)
+    select = JoinAlias.select((JoinAlias.q.name == 'a') & (alias.q.name == 'b'),
+        join=LEFTJOINOn(None, alias, alias.q.name == 'c')
+    )
+    assert str(select) == \
+        "SELECT join_alias.id, join_alias.name, join_alias.parent FROM join_alias LEFT JOIN join_alias  join_alias_alias3 ON ((join_alias_alias3.name) = ('c')) WHERE (((join_alias.name) = ('a')) AND ((join_alias_alias3.name) = ('b')))"