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

[kobold at codespeak.net]

Author: kobold
Date: Thu Jan 11 18:55:35 2007
New Revision: 36520

Modified:
   z3/sqlos/trunk/src/sqlos/zsqlobject.py
Log:
Fixed objects returned by SingleJoin relationships.


Modified: z3/sqlos/trunk/src/sqlos/zsqlobject.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/zsqlobject.py	(original)
+++ z3/sqlos/trunk/src/sqlos/zsqlobject.py	Thu Jan 11 18:55:35 2007
@@ -152,7 +152,9 @@
                 obj = getattr(self, name)
                 if ISelectResults.providedBy(obj):
                     obj = contained(ISQLObjectJoinContainer(obj), parent=self, name=name)
-                elif not ISQLObject.providedBy(obj):
+                elif ISQLObject.providedBy(obj):
+                    obj = contained(obj, parent=self, name=name)
+                else:
                     obj = None
 
         if obj is not None: