[z3-checkins] r36610 - z3/sqlos/trunk/src/sqlos

[kobold at codespeak.net]

Author: kobold
Date: Fri Jan 12 19:17:25 2007
New Revision: 36610

Modified:
   z3/sqlos/trunk/src/sqlos/zsqlobject.py
Log:
Do not break on MultipleJoin or RelatedJoin: we ignore them becase we do not support them.


Modified: z3/sqlos/trunk/src/sqlos/zsqlobject.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/zsqlobject.py	(original)
+++ z3/sqlos/trunk/src/sqlos/zsqlobject.py	Fri Jan 12 19:17:25 2007
@@ -184,7 +184,10 @@
                isinstance(sqlmeta.columns[column], sqlobject.SOForeignKey):
                 yield sqlmeta.columns[column].foreignName
         for join in sqlmeta.joins:
-            yield join.joinDef.name
+            obj = getattr(self, join.joinDef.name)
+            if ISelectResults.providedBy(obj) or \
+               ISQLObject.providedBy(obj):
+                yield join.joinDef.name
 
     def items(self):
         """See zope.app.container.interfaces.IReadContainer"""