Update of /cvsroot/sqlobject/SQLObject/SQLObject
In directory sc8-pr-cvs1:/tmp/cvs-serv2091/SQLObject
Modified Files:
Join.py
Log Message:
Made joins use transactions
Index: Join.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Join.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Join.py 28 Jun 2003 22:20:20 -0000 1.5
--- Join.py 4 Nov 2003 02:28:53 -0000 1.6
***************
*** 103,107 ****
self.joinColumn,
inst.id)
! return self._applyOrderBy([self.otherClass(id) for (id,) in ids if id is not None], self.otherClass)
class MultipleJoin(Join):
--- 103,111 ----
self.joinColumn,
inst.id)
! if inst._SO_perConnection:
! conn = inst._connection
! else:
! conn = None
! return self._applyOrderBy([self.otherClass(id, conn) for (id,) in ids if id is not None], self.otherClass)
class MultipleJoin(Join):
***************
*** 139,143 ****
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):
--- 143,151 ----
self.joinColumn,
inst.id)
! if inst._SO_perConnection:
! conn = inst._connection
! else:
! conn = None
! return self._applyOrderBy([self.otherClass(id, conn) for (id,) in ids if id is not None], self.otherClass)
def remove(self, inst, other):
|
