equal
deleted
inserted
replaced
207 def tearDown(self): |
207 def tearDown(self): |
208 undo_monkey_patch() |
208 undo_monkey_patch() |
209 |
209 |
210 def _prepare_plan(self, cnx, rql, kwargs=None): |
210 def _prepare_plan(self, cnx, rql, kwargs=None): |
211 rqlst = self.repo.vreg.rqlhelper.parse(rql, annotate=True) |
211 rqlst = self.repo.vreg.rqlhelper.parse(rql, annotate=True) |
212 self.repo.vreg.solutions(cnx, rqlst, kwargs) |
212 self.repo.vreg.compute_var_types(cnx, rqlst, kwargs) |
213 if rqlst.TYPE == 'select': |
213 if rqlst.TYPE == 'select': |
214 self.repo.vreg.rqlhelper.annotate(rqlst) |
214 self.repo.vreg.rqlhelper.annotate(rqlst) |
215 for select in rqlst.children: |
215 for select in rqlst.children: |
216 select.solutions.sort(key=lambda x: list(x.items())) |
216 select.solutions.sort(key=lambda x: list(x.items())) |
217 else: |
217 else: |