[SQL-CVS] r730 - in trunk/SQLObject/sqlobject: . tests

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

Author: phd
Date: 2005-04-20 12:00:32 +0000 (Wed, 20 Apr 2005)
New Revision: 730

Modified:
   trunk/SQLObject/sqlobject/dbconnection.py
   trunk/SQLObject/sqlobject/tests/test_aliases.py
Log:
Removed an excessive space before WHERE.


Modified: trunk/SQLObject/sqlobject/dbconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/dbconnection.py	2005-04-19 11:41:17 UTC (rev 729)
+++ trunk/SQLObject/sqlobject/dbconnection.py	2005-04-20 12:00:32 UTC (rev 730)
@@ -351,7 +351,7 @@
         else:
             tables = select.tables
         q = "SELECT %s" % ", ".join([str(expression) for expression in expressions])
-        q += " FROM %s " % ", ".join(tables)
+        q += " FROM %s" % ", ".join(tables)
         if join: q += self._addJoins(select)
         q += " WHERE"
         q = self._addWhereClause(select, q, limit=0, order=0)
@@ -373,18 +373,18 @@
         else:
             q = 'SELECT '
         if ops.get('lazyColumns', 0):
-            q += "%s.%s FROM %s " % \
+            q += "%s.%s FROM %s" % \
                  (cls.sqlmeta.table, cls.sqlmeta.idName,
                   ", ".join(tables))
         else:
             columns = ", ".join(["%s.%s" % (cls.sqlmeta.table, col.dbName)
                                  for col in cls.sqlmeta._columns])
             if columns:
-                q += "%s.%s, %s FROM %s " % \
+                q += "%s.%s, %s FROM %s" % \
                      (cls.sqlmeta.table, cls.sqlmeta.idName, columns,
                       ", ".join(tables))
             else:
-                q += "%s.%s FROM %s " % \
+                q += "%s.%s FROM %s" % \
                      (cls.sqlmeta.table, cls.sqlmeta.idName,
                       ", ".join(tables))
 
@@ -413,11 +413,12 @@
         ops = select.ops
         join = ops.get('join')
         if type(join) is str:
-            return join
+            pass
         elif isinstance(join, sqlbuilder.SQLJoin):
-            return self.sqlrepr(join)
+            join_str = self.sqlrepr(join)
         else:
-            return ", ".join([self.sqlrepr(j) for j in join])
+            join_str = ", ".join([self.sqlrepr(j) for j in join])
+        return ' ' + join_str
 
     def _addWhereClause(self, select, startSelect, limit=1, order=1):
 

Modified: trunk/SQLObject/sqlobject/tests/test_aliases.py
===================================================================
--- trunk/SQLObject/sqlobject/tests/test_aliases.py	2005-04-19 11:41:17 UTC (rev 729)
+++ trunk/SQLObject/sqlobject/tests/test_aliases.py	2005-04-20 12:00:32 UTC (rev 730)
@@ -15,7 +15,7 @@
     alias = Alias(TestJoinAlias)
     select = TestJoinAlias.select(TestJoinAlias.q.parent == alias.q.name)
     assert str(select) == \
-        "SELECT test_join_alias.id, test_join_alias.name, test_join_alias.parent FROM test_join_alias, test_join_alias AS test_join_alias_alias1  WHERE (test_join_alias.parent = test_join_alias_alias1.name)"
+        "SELECT test_join_alias.id, test_join_alias.name, test_join_alias.parent FROM test_join_alias, test_join_alias AS test_join_alias_alias1 WHERE (test_join_alias.parent = test_join_alias_alias1.name)"
 
 def test_2perform_join():
     setupClass(TestJoinAlias)