Update of /cvsroot/sqlobject/SQLObject/SQLObject
In directory sc8-pr-cvs1:/tmp/cvs-serv11549/SQLObject
Modified Files:
Join.py
Log Message:
Trim null values from joins
Index: Join.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Join.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Join.py 30 May 2003 02:22:51 -0000 1.2
--- Join.py 4 Jun 2003 05:19:05 -0000 1.3
***************
*** 82,86 ****
self.joinColumn,
inst.id)
! return self._applyOrderBy([self.otherClass(id) for (id,) in ids], self.otherClass)
class MultipleJoin(Join):
--- 82,86 ----
self.joinColumn,
inst.id)
! return self._applyOrderBy([self.otherClass(id) for (id,) in ids if id is not None], self.otherClass)
class MultipleJoin(Join):
***************
*** 118,122 ****
self.joinColumn,
inst.id)
! return self._applyOrderBy([self.otherClass(id) for (id,) in ids], self.otherClass)
def remove(self, inst, other):
--- 118,122 ----
self.joinColumn,
inst.id)
! return self._applyOrderBy([self.otherClass(id) for (id,) in ids if id is not None], self.otherClass)
def remove(self, inst, other):
|
