call on query must return result

propagate params from call to asSQLExpression on Query


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17851 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ZSQLCatalog/SQLCatalog.py

@@ -326,8 +326,8 @@ class Query(QueryMixin):
     self.type = type
     self.search_key = key
 
-  def __call__(self):
-    self.asSQLExpression()
+  def __call__(self, **kw):
+    return self.asSQLExpression(**kw)
 
   def getRange(self):
     return self.range
@@ -384,7 +384,7 @@ class Query(QueryMixin):
     range_value = self.getRange()
     format = self.getFormat()
     if ignore_key:
-      pass
+      pass    
     elif range_value is not None:
       if isinstance(value, (list, tuple)):
         if format is None:
@@ -530,8 +530,8 @@ class ComplexQuery(QueryMixin):
     # XXX: What is that used for ?! It's utterly dangerous.
     self.__dict__.update(kw)
 
-  def __call__(self):
-    self.asSQLExpression()
+  def __call__(self, **kw):
+    return self.asSQLExpression(**kw)
 
   def getQueryList(self):
     return self.query_list