[SQL-CVS] r2730 - SQLObject/trunk/sqlobject

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

Author: phd
Date: 2007-07-05 11:23:01 -0600 (Thu, 05 Jul 2007)
New Revision: 2730

Modified:
   SQLObject/trunk/sqlobject/sqlbuilder.py
Log:
A bug fix (on behalf of Luke Opperman).


Modified: SQLObject/trunk/sqlobject/sqlbuilder.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlbuilder.py	2007-07-05 15:46:14 UTC (rev 2729)
+++ SQLObject/trunk/sqlobject/sqlbuilder.py	2007-07-05 17:23:01 UTC (rev 2730)
@@ -381,7 +381,7 @@
             raise AttributeError
         if attr == 'id':
             return self._getattrFromID(attr)
-        elif attr+'ID' in self.soClass.sqlmeta.columns:
+        elif attr+'ID' in [k for (k, v) in self.soClass.sqlmeta.columns.items() if v.foreignKey]:
             column = self.soClass.sqlmeta.columns[attr+'ID']
             return self._getattrFromForeignKey(column, attr)
         elif attr in [x.joinMethodName for x in self.soClass.sqlmeta.joins]:
@@ -401,7 +401,6 @@
 
     def _getattrFromForeignKey(self, column, attr):
         ret =  getattr(self, column.name)==getattr(self.soClass, '_SO_class_'+column.foreignKey).q.id
-        print column
         return ret
 
     def _getattrFromJoin(self, join, attr):