Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[querier] actually fix bug attempted to be fixed in 5942:f1abba8ccc01. The pb was not in multi-sources but because of missing annotation on rql generated by security insertion
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Mon, 19 Jul 2010 10:10:20 +0200
changeset 5989 099d46422f5a
parent 5988 d8ac8acd27f9
child 5990 6f3c77c79a88
[querier] actually fix bug attempted to be fixed in 5942:f1abba8ccc01. The pb was not in multi-sources but because of missing annotation on rql generated by security insertion
server/msplanner.py file | annotate | diff | comparison | revisions
server/querier.py file | annotate | diff | comparison | revisions 
--- a/server/msplanner.py	Sat Jul 17 10:00:05 2010 +0200
+++ b/server/msplanner.py	Mon Jul 19 10:10:20 2010 +0200
@@ -1155,7 +1155,6 @@
                 sunion = Union()
                 for select in queries:
                     sunion.append(select)
-                    self.rqlhelper.annotate(select)
                 if temptable:
                     steps.append(FetchStep(plan, sunion, sources, temptable, True, inputmap))
                 else:
--- a/server/querier.py	Sat Jul 17 10:00:05 2010 +0200
+++ b/server/querier.py	Mon Jul 19 10:10:20 2010 +0200
@@ -360,6 +360,7 @@
                     select.set_possible_types(localchecks[()])
                     add_types_restriction(self.schema, select)
                     add_noinvariant(noinvariant, restricted, select, nbtrees)
+                self.rqlhelper.annotate(union)
 
     def _check_permissions(self, rqlst):
         """return a dict defining "local checks", e.g. RQLExpression defined in
cubicweb