cubicweb/server/querier.py
changeset 12887 11953d585a55
parent 12886 fa565be41647
child 12888 24a20d2b8c84
--- a/cubicweb/server/querier.py	Wed Mar 13 10:40:05 2019 +0100
+++ b/cubicweb/server/querier.py	Wed Mar 13 11:02:39 2019 +0100
@@ -211,7 +211,7 @@
             noinvariant = ()
         if cached is None:
             self.cnx.vreg.rqlhelper.simplify(union)
-            self.querier.rqlannotator.annotate(union)
+            RQLAnnotator(self.querier.schema).annotate(union)
             set_qdata(self.querier.schema.rschema, union, noinvariant)
         if union.has_text_query:
             self.cache_key = None
@@ -475,8 +475,6 @@
         self.clear_caches()
         # rql planner
         self._planner = SSPlanner(schema, self._repo.vreg.rqlhelper)
-        # sql generation annotator
-        self.rqlannotator = RQLAnnotator(schema)
 
     def clear_caches(self, eids=None, etypes=None):
         if eids is None:
@@ -562,7 +560,6 @@
         }
 
         start = time.time()
-
         # execute the plan
         try:
             results = plan.execute()