[ms] log after preprocessing, else we don't see the query which is actually planned (may have been modified by security insertion) stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 28 Jul 2010 11:39:47 +0200
branchstable
changeset 6027 f91b72def783
parent 6025 e04e9ca67ada
child 6028 c83167d1b040
[ms] log after preprocessing, else we don't see the query which is actually planned (may have been modified by security insertion)
server/msplanner.py
--- a/server/msplanner.py	Tue Jul 27 19:13:27 2010 +0200
+++ b/server/msplanner.py	Wed Jul 28 11:39:47 2010 +0200
@@ -1076,14 +1076,14 @@
 
         the rqlst should not be tagged at this point
         """
-        if server.DEBUG & server.DBG_MS:
-            print '-'*80
-            print 'PLANNING', rqlst
         # preprocess deals with security insertion and returns a new syntax tree
         # which have to be executed to fulfill the query: according
         # to permissions for variable's type, different rql queries may have to
         # be executed
         plan.preprocess(rqlst)
+        if server.DEBUG & server.DBG_MS:
+            print '-'*80
+            print 'PLANNING', rqlst
         ppis = [PartPlanInformation(plan, select, self.rqlhelper)
                 for select in rqlst.children]
         steps = self._union_plan(plan, ppis)