[SQL-CVS] r1781 - in home/phd/SQLObject/paramstyles/sqlobject: . tests

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

Author: phd
Date: 2006-05-19 08:22:12 -0600 (Fri, 19 May 2006)
New Revision: 1781

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py
   home/phd/SQLObject/paramstyles/sqlobject/tests/test_joins_conditional.py
Log:
Merged patches from the revisions 1778:1780 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py	2006-05-19 14:21:37 UTC (rev 1780)
+++ home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py	2006-05-19 14:22:12 UTC (rev 1781)
@@ -890,7 +890,7 @@
                 if hasattr(col, "__sqlrepr__"):
                     col = sqlrepr(col, db)
                 using_columns.append(col)
-            using_columns = ", ".join()
+            using_columns = ", ".join(using_columns)
             join = "%s %s USING (%s)" % (self.op, self.table2, using_columns)
             if self.table1:
                 join = "%s %s" % (self.table1, join)

Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/test_joins_conditional.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/test_joins_conditional.py	2006-05-19 14:21:37 UTC (rev 1780)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/test_joins_conditional.py	2006-05-19 14:22:12 UTC (rev 1781)
@@ -69,3 +69,13 @@
     )
     assert str(select) == \
         "SELECT test_join1.id, test_join1.col1 FROM test_join1  LEFT JOIN test_join2  LEFT JOIN test_join3 WHERE 1 = 1"
+
+def test_6join_using():
+    setup()
+    setupClass(TestJoin3)
+
+    select = TestJoin1.select(
+        join=LEFTJOINUsing(None, TestJoin2, [TestJoin2.q.id])
+    )
+    assert str(select) == \
+        "SELECT test_join1.id, test_join1.col1 FROM test_join1 LEFT JOIN test_join2 USING (test_join2.id) WHERE 1 = 1"