equal
deleted
inserted
replaced
600 appid = 'data-rewrite' |
600 appid = 'data-rewrite' |
601 |
601 |
602 def process(self, rql, args=None): |
602 def process(self, rql, args=None): |
603 if args is None: |
603 if args is None: |
604 args = {} |
604 args = {} |
605 querier = self.repo.querier |
|
606 union = parse(rql) # self.vreg.parse(rql, annotate=True) |
605 union = parse(rql) # self.vreg.parse(rql, annotate=True) |
607 with self.admin_access.repo_cnx() as cnx: |
606 with self.admin_access.repo_cnx() as cnx: |
608 self.vreg.solutions(cnx, union, args) |
607 self.vreg.solutions(cnx, union, args) |
609 querier._annotate(union) |
608 self.vreg.rqlhelper.annotate(union) |
610 plan = querier.plan_factory(union, args, cnx) |
609 plan = self.repo.querier.plan_factory(union, args, cnx) |
611 plan.preprocess(union) |
610 plan.preprocess(union) |
612 return union |
611 return union |
613 |
612 |
614 def test_ambiguous_optional_same_exprs(self): |
613 def test_ambiguous_optional_same_exprs(self): |
615 """See #3013535""" |
614 """See #3013535""" |