diff -r 23081860ea60 -r ad995a9905f9 cubicweb/test/unittest_rqlrewrite.py --- a/cubicweb/test/unittest_rqlrewrite.py Tue Mar 12 23:04:57 2019 +0100 +++ b/cubicweb/test/unittest_rqlrewrite.py Tue Mar 12 23:45:15 2019 +0100 @@ -602,12 +602,11 @@ def process(self, rql, args=None): if args is None: args = {} - querier = self.repo.querier union = parse(rql) # self.vreg.parse(rql, annotate=True) with self.admin_access.repo_cnx() as cnx: self.vreg.solutions(cnx, union, args) - querier._annotate(union) - plan = querier.plan_factory(union, args, cnx) + self.vreg.rqlhelper.annotate(union) + plan = self.repo.querier.plan_factory(union, args, cnx) plan.preprocess(union) return union