[SQL-CVS] r2534 - SQLObject/branches/cache-deps-on-views/sqlobject

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

Author: luke
Date: 2007-04-15 16:15:10 -0600 (Sun, 15 Apr 2007)
New Revision: 2534

Modified:
   SQLObject/branches/cache-deps-on-views/sqlobject/sresults.py
Log:
Bug in select.throughTo

Modified: SQLObject/branches/cache-deps-on-views/sqlobject/sresults.py
===================================================================
--- SQLObject/branches/cache-deps-on-views/sqlobject/sresults.py	2007-04-15 22:14:44 UTC (rev 2533)
+++ SQLObject/branches/cache-deps-on-views/sqlobject/sresults.py	2007-04-15 22:15:10 UTC (rev 2534)
@@ -324,19 +324,19 @@
     def _throughToMultipleJoin(self, join):
         otherClass = join.otherClass
         colName = join.soClass.sqlmeta.style.dbColumnToPythonAttr(join.joinColumn)
-        query = self.queryForSelect().newItems([sqlbuilder.ColumnAS(self.sourceClass.q.id, self.sourceClass.q.id.fieldName)])
+        query = self.queryForSelect().newItems([sqlbuilder.ColumnAS(self.sourceClass.q.id, 'id')])
         query = sqlbuilder.Alias(query, "%s_%s" % (self.sourceClass.__name__, join.joinMethodName))
         joinColumn = getattr(otherClass.q, colName)
-        return otherClass, joinColumn==getattr(query.q, self.sourceClass.q.id.fieldName)
+        return otherClass, joinColumn==query.q.id
 
     def _throughToRelatedJoin(self, join):
         otherClass = join.otherClass
         intTable = sqlbuilder.Table(join.intermediateTable)
         colName = join.joinColumn
-        query = self.queryForSelect().newItems([sqlbuilder.ColumnAS(getattr(intTable, colName), colName)])
+        query = self.queryForSelect().newItems([sqlbuilder.ColumnAS(self.sourceClass.q.id, 'id')])#sqlbuilder.ColumnAS(getattr(intTable, colName), colName)])
         query = sqlbuilder.Alias(query, "%s_%s" % (self.sourceClass.__name__, join.joinMethodName))
         clause = sqlbuilder.AND(otherClass.q.id == getattr(intTable, join.otherColumn),
-                     getattr(intTable, colName) == getattr(query.q, colName))
+                     getattr(intTable, colName) == query.q.id)
         return otherClass, clause
 
 __all__ = ['SelectResults']