closes #71131: as_string doesn't propagate encoding/kwargs to subqueries
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Tue, 19 Jul 2011 18:12:59 +0200
changeset 642 1f4c9c361cd4
parent 641 f813dfc090ed
child 643 0e6e5192f32c
closes #71131: as_string doesn't propagate encoding/kwargs to subqueries
ChangeLog
nodes.py
--- a/ChangeLog	Tue Jul 19 18:10:56 2011 +0200
+++ b/ChangeLog	Tue Jul 19 18:12:59 2011 +0200
@@ -7,6 +7,8 @@
     * rql annotator add 'having' list into variable's stinfo, and
       properly update variable graph
 
+    * #71131: as_string doesn't  propagate encoding/kwargs to subqueries
+
     * Select.replace must properly reset old node's parent attribute
 
     * new undo_modification context manager on select nodes
--- a/nodes.py	Tue Jul 19 18:10:56 2011 +0200
+++ b/nodes.py	Tue Jul 19 18:12:59 2011 +0200
@@ -195,6 +195,7 @@
         """builds a restriction node to express : variable is etype"""
         return self.add_constant_restriction(var, 'is', etype, 'etype')
 
+
 # base RQL nodes ##############################################################
 
 class SubQuery(BaseNode):
@@ -224,7 +225,7 @@
 
     def as_string(self, encoding=None, kwargs=None):
         return '%s BEING (%s)' % (','.join(v.name for v in self.aliases),
-                                  self.query.as_string())
+                                  self.query.as_string(encoding, kwargs))
     def __repr__(self):
         return '%s BEING (%s)' % (','.join(repr(v) for v in self.aliases),
                                   repr(self.query))