[SQL-CVS] r2568 - in SQLObject/branches/0.7: docs sqlobject sqlobject/tests

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

Author: phd
Date: 2007-04-20 07:38:55 -0600 (Fri, 20 Apr 2007)
New Revision: 2568

Modified:
   SQLObject/branches/0.7/docs/News.txt
   SQLObject/branches/0.7/sqlobject/dbconnection.py
   SQLObject/branches/0.7/sqlobject/tests/test_joins_conditional.py
Log:
Fixed a bug with absent comma in JOINs.


Modified: SQLObject/branches/0.7/docs/News.txt
===================================================================
--- SQLObject/branches/0.7/docs/News.txt	2007-04-18 20:55:52 UTC (rev 2567)
+++ SQLObject/branches/0.7/docs/News.txt	2007-04-20 13:38:55 UTC (rev 2568)
@@ -17,6 +17,8 @@
 
 * Fixed a longstanding bug with .select() ignoring 'limit' parameter.
 
+* Fixed a bug with absent comma in JOINs.
+
 SQLObject 0.7.5
 ===============
 

Modified: SQLObject/branches/0.7/sqlobject/dbconnection.py
===================================================================
--- SQLObject/branches/0.7/sqlobject/dbconnection.py	2007-04-18 20:55:52 UTC (rev 2567)
+++ SQLObject/branches/0.7/sqlobject/dbconnection.py	2007-04-20 13:38:55 UTC (rev 2568)
@@ -441,7 +441,7 @@
         if type(join) is str:
             join_str = ' ' + join
         elif isinstance(join, sqlbuilder.SQLJoin):
-            if tables and join.table1:
+            if join.table1:
                 join_str = ", "
             else:
                 join_str = ' '
@@ -449,11 +449,13 @@
         else:
             join_str = ""
             for j in join:
-                if tables and j.table1:
+                if j.table1:
                     sep = ", "
                 else:
                     sep = ' '
                 join_str += sep + self.sqlrepr(j)
+        if not tables and join_str.startswith(','):
+            join_str = join_str[1:].strip()
         return join_str
 
     def _addWhereClause(self, select, startSelect, limit=1, order=1):

Modified: SQLObject/branches/0.7/sqlobject/tests/test_joins_conditional.py
===================================================================
--- SQLObject/branches/0.7/sqlobject/tests/test_joins_conditional.py	2007-04-18 20:55:52 UTC (rev 2567)
+++ SQLObject/branches/0.7/sqlobject/tests/test_joins_conditional.py	2007-04-20 13:38:55 UTC (rev 2568)
@@ -41,7 +41,7 @@
             on_condition=(TestJoin1.q.col1 == TestJoin2.q.col2))
     )
     assert str(select) == \
-        "SELECT test_join1.id, test_join1.col1 FROM  test_join1 LEFT JOIN test_join2 ON ((test_join1.col1) = (test_join2.col2)) WHERE 1 = 1"
+        "SELECT test_join1.id, test_join1.col1 FROM test_join1 LEFT JOIN test_join2 ON ((test_join1.col1) = (test_join2.col2)) WHERE 1 = 1"
 
 def test_3perform_join():
     setup()
@@ -76,6 +76,12 @@
     assert str(select) == \
         "SELECT test_join1.id, test_join1.col1 FROM test_join1  LEFT JOIN test_join2  LEFT JOIN test_join3 WHERE 1 = 1"
 
+    select = TestJoin1.select(
+        join=(LEFTJOIN(TestJoin1, TestJoin2), LEFTJOIN(TestJoin1, TestJoin3))
+    )
+    assert str(select) == \
+        "SELECT test_join1.id, test_join1.col1 FROM test_join1 LEFT JOIN test_join2, test_join1 LEFT JOIN test_join3 WHERE 1 = 1"
+
 def test_6join_using():
     setup()
     setupClass(TestJoin3)