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

[kobold at codespeak.net]

Author: kobold
Date: Sun Jan 21 11:11:13 2007
New Revision: 37089

Modified:
   z3/sqlos/trunk/src/sqlos/zsqlobject.py
Log:
Fixed proxy issues.


Modified: z3/sqlos/trunk/src/sqlos/zsqlobject.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/zsqlobject.py	(original)
+++ z3/sqlos/trunk/src/sqlos/zsqlobject.py	Sun Jan 21 11:11:13 2007
@@ -365,12 +365,12 @@
 
     def orderBy(self, orderBy):
         """See sqlos.interfaces.ISelectResults"""
-        return contained(self.context.orderBy(orderBy),
+        return contained(ISQLObjectJoinContainer(self.context.orderBy(orderBy)),
             name=self.__name__, parent=self.__parent__)
 
     def newClause(self, newClause):
         """See sqlos.interfaces.ISelectResults"""
-        return contained(self.context.newClause(newClause),
+        return contained(ISQLObjectJoinContainer(self.context.newClause(newClause)),
             name=self.__name__, parent=self.__parent__)
 
     def max(self, attribute):
@@ -391,7 +391,7 @@
 
     def reversed(self):
         """See sqlos.interfaces.ISelectResults"""
-        return contained(self.context.reversed(),
+        return contained(ISQLObjectJoinContainer(self.context.reversed()),
             name=self.__name__, parent=self.__parent__)
 
     def accumulate(self, *expressions):
@@ -416,30 +416,30 @@
 
     def distinct(self):
         """See sqlos.interfaces.ISelectResults"""
-        return contained(self.context.distinct(),
+        return contained(ISQLObjectJoinContainer(self.context.distinct()),
             name=self.__name__, parent=self.__parent__)
 
     def filter(self, filter_clause):
         """See sqlos.interfaces.ISelectResults"""
-        return contained(self.context.filter(filter_clause),
+        return contained(ISQLObjectJoinContainer(self.context.filter(filter_clause)),
             name=self.__name__, parent=self.__parent__)
 
     def connection(self, conn):
         """See sqlos.interfaces.ISelectResults"""
-        return contained(self.context.connection(connection=con),
+        return contained(ISQLObjectJoinContainer(self.context.connection(connection=con)),
             name=self.__name__, parent=self.__parent__)
 
     def limit(self, limit):
         """See sqlos.interfaces.ISelectResults"""
-        return contained(self.context.limit(limit),
+        return contained(ISQLObjectJoinContainer(self.context.limit(limit)),
             name=self.__name__, parent=self.__parent__)
 
     def lazyColumns(self, value):
         """See sqlos.interfaces.ISelectResults"""
-        return contained(self.context.lazyColumns(value),
+        return contained(ISQLObjectJoinContainer(self.context.lazyColumns(value)),
             name=self.__name__, parent=self.__parent__)
 
     def clone(self, **newOpts):
         """See sqlos.interfaces.ISelectResults"""
-        return contained(self.context.clone(**newOpts),
+        return contained(ISQLObjectJoinContainer(self.context.clone(**newOpts)),
             name=self.__name__, parent=self.__parent__)