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

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

Author: ianb
Date: 2004-09-03 07:50:04 -0400 (Fri, 03 Sep 2004)
New Revision: 211

Modified:
   trunk/SQLObject/sqlobject/joins.py
Log:
Pay attention to joinMethodName keyword argument to joins


Modified: trunk/SQLObject/sqlobject/joins.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/SQLObject/sqlobject/joins.py	2004-08-30 17:19:22 UTC (rev 210)
+++ trunk/SQLObject/sqlobject/joins.py	2004-09-03 11:50:04 UTC (rev 211)
@@ -17,7 +17,10 @@
         kw['otherClass'] =3D otherClass
         kw['joinDef'] =3D self
         self.kw =3D kw
-        self._joinMethodName =3D None
+        if self.kw.has_key('joinMethodName'):
+            self._joinMethodName =3D self.kw.pop('joinMethodName')
+        else:
+            self._joinMethodName =3D None
=20
     def _set_joinMethodName(self, value):
         assert self._joinMethodName =3D=3D value or self._joinMethodName=
 is None, "You have already given an explicit joinMethodName (%s), and yo=
u are now setting it to %s" % (self._joinMethodName, value)