# HG changeset patch # User Sylvain Thénault # Date 1279527020 -7200 # Node ID 099d46422f5ac0b9460040d2cda2d3d34ef155a7 # Parent d8ac8acd27f9bd28622b400de017184b259fc217 [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 diff -r d8ac8acd27f9 -r 099d46422f5a server/msplanner.py --- 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: diff -r d8ac8acd27f9 -r 099d46422f5a server/querier.py --- 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