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

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

Author: ianb
Date: 2005-11-26 21:44:54 +0000 (Sat, 26 Nov 2005)
New Revision: 1323

Modified:
   SQLObject/trunk/sqlobject/joins.py
Log:
Added a clause attribute to ManyToMany and OneToMany join objects, which you can use in queries

Modified: SQLObject/trunk/sqlobject/joins.py
===================================================================
--- SQLObject/trunk/sqlobject/joins.py	2005-11-26 21:43:25 UTC (rev 1322)
+++ SQLObject/trunk/sqlobject/joins.py	2005-11-26 21:44:54 UTC (rev 1323)
@@ -316,6 +316,11 @@
                       self.soClass, events.CreateTableSignal)
         events.listen(self.event_CreateTableSignal,
                       self.otherClass, events.CreateTableSignal)
+        self.clause = (
+            (self.otherClass.q.id ==
+             sqlbuilder.Field(self.intermediateTable, self.otherColumn))
+            & (sqlbuilder.Field(self.intermediateTable, self.joinColumn)
+               == self.soClass.q.id))
 
     def __get__(self, obj, type):
         if obj is None:
@@ -407,6 +412,9 @@
         classregistry.registry(
             soClass.sqlmeta.registry).addClassCallback(
             join, self._setOtherClass)
+        self.clause = (
+            sqlbuilder.Field(self.otherClass.sqlmeta.table, self.joinColumn)
+            == self.soClass.q.id)
 
     def _setOtherClass(self, otherClass):
         self.otherClass = otherClass