[SQL-CVS] SQLObject/SQLObject SQLObject.py,1.43,1.44

[<ian...@us...>]

Update of /cvsroot/sqlobject/SQLObject/SQLObject
In directory sc8-pr-cvs1:/tmp/cvs-serv14543

Modified Files:
	SQLObject.py 
Log Message:
More foreignKey fixes


Index: SQLObject.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLObject.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** SQLObject.py	30 May 2003 03:24:53 -0000	1.43
--- SQLObject.py	31 May 2003 02:00:39 -0000	1.44
***************
*** 85,90 ****
                  cls = findClass(needClass, registry=registryName)
                  for obj, attr in q:
!                     if callable(getattr(obj, attr, None)):
!                         getattr(obj, attr)(cls)
                      else:
                          setattr(obj, attr, cls)
--- 85,93 ----
                  cls = findClass(needClass, registry=registryName)
                  for obj, attr in q:
!                     curr = getattr(obj, attr, None)
!                     if curr is cls:
!                         pass
!                     elif callable(curr):
!                         curr(cls)
                      else:
                          setattr(obj, attr, cls)
***************
*** 469,473 ****
                  # self._SO_class_className is a reference
                  # to the class in question.
!                 getter = eval('lambda self: self._SO_foreignKey(self.%s and self._SO_class_%s)' % (instanceName(name), column.foreignKey))
              else:
                  # Same non-caching version as above.
--- 472,476 ----
                  # self._SO_class_className is a reference
                  # to the class in question.
!                 getter = eval('lambda self: self._SO_foreignKey(self.%s, self._SO_class_%s)' % (instanceName(name), column.foreignKey))
              else:
                  # Same non-caching version as above.