[SQL-CVS] SQLObject/SQLObject Join.py,1.1,1.2 SQLObject.py,1.41,1.42

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

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

Modified Files:
	Join.py SQLObject.py 
Log Message:
* More addNeedSet jazz
* foreignKey objects inherit the connection


Index: Join.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Join.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Join.py	26 May 2003 21:48:54 -0000	1.1
--- Join.py	30 May 2003 02:22:51 -0000	1.2
***************
*** 94,108 ****
                   intermediateTable=None, **kw):
          SOMultipleJoin.__init__(self, **kw)
!         if not otherColumn:
!             self.otherColumn = self.soClass._style.pythonClassToDBTableReference(self.otherClassName)
!         else:
!             self.otherColumn = otherColumn
!         if not intermediateTable:
              names = [self.soClass._table,
!                      self.soClass._style.pythonClassToDBTable(self.otherClassName)]
              names.sort()
              self.intermediateTable = '%s_%s' % (names[0], names[1])
!         else:
!             self.intermediateTable = intermediateTable
  
      def hasIntermediateTable(self):
--- 94,111 ----
                   intermediateTable=None, **kw):
          SOMultipleJoin.__init__(self, **kw)
!         self.intermediateTable = intermediateTable
!         self.otherColumn = otherColumn
!         SQLObject.addNeedSet(self, self.otherClassName,
!                              self.soClass._registry, '_setOtherClass')
! 
!     def _setOtherClass(self, otherClass):
!         if not self.intermediateTable:
              names = [self.soClass._table,
!                      otherClass._table]
              names.sort()
              self.intermediateTable = '%s_%s' % (names[0], names[1])
!         if not self.otherColumn:
!             self.otherColumn = self.soClass._style.tableReference(otherClass._table)
!         
  
      def hasIntermediateTable(self):

Index: SQLObject.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLObject.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** SQLObject.py	30 May 2003 02:18:45 -0000	1.41
--- SQLObject.py	30 May 2003 02:22:51 -0000	1.42
***************
*** 727,730 ****
--- 727,732 ----
          if id is None:
              return None
+         elif self._SO_perConnection:
+             return joinClass(id, connection=self._connection)
          else:
              return joinClass(id)