cubicweb/server/querier.py
changeset 12495 23081860ea60
parent 12242 68ca7fe0ca29
child 12496 ad995a9905f9
equal deleted inserted replaced
12494:3c2f104638dd 12495:23081860ea60
   165         # execution steps
   165         # execution steps
   166         self.steps = []
   166         self.steps = []
   167         # various resource accesors
   167         # various resource accesors
   168         self.querier = querier
   168         self.querier = querier
   169         self.schema = querier.schema
   169         self.schema = querier.schema
   170         self.sqlannotate = querier.sqlgen_annotate
       
   171         self.rqlhelper = cnx.vreg.rqlhelper
   170         self.rqlhelper = cnx.vreg.rqlhelper
   172 
   171 
   173     def annotate_rqlst(self):
   172     def annotate_rqlst(self):
   174         if not self.rqlst.annotated:
   173         if not self.rqlst.annotated:
   175             self.rqlhelper.annotate(self.rqlst)
   174             self.rqlhelper.annotate(self.rqlst)
   217                     self.cnx.transaction_data[key] = (union, self.args)
   216                     self.cnx.transaction_data[key] = (union, self.args)
   218         else:
   217         else:
   219             noinvariant = ()
   218             noinvariant = ()
   220         if cached is None:
   219         if cached is None:
   221             self.rqlhelper.simplify(union)
   220             self.rqlhelper.simplify(union)
   222             self.sqlannotate(union)
   221             self.querier.sqlgen_annotate(union)
   223             set_qdata(self.schema.rschema, union, noinvariant)
   222             set_qdata(self.schema.rschema, union, noinvariant)
   224         if union.has_text_query:
   223         if union.has_text_query:
   225             self.cache_key = None
   224             self.cache_key = None
   226 
   225 
   227     def _insert_security(self, union):
   226     def _insert_security(self, union):