rqlrewrite: remove element in rewritten when we remove them from the select (closes #2236985) update _cleanup_inserted to avoid leaving rewritten variable behind when removing a snipset. insert_varmap_snippets was impacted too for unclear reason --- Before A KeyError was raised when: * multiple snipset is to be inserted on a statement * some *supported* snipset adds ambiguity (increase the number of solution) * some *unsupported* snipset adds new variable * The new variable require rewritting :: File "/home/pyves/src/fcw/cubicweb/rqlrewrite.py", line 185, in rewrite newsolutions = self.remove_ambiguities(snippets, newsolutions) File "/home/pyves/src/fcw/cubicweb/rqlrewrite.py", line 436, in remove_ambiguities variantes = self.build_variantes(newsolutions) File "/home/pyves/src/fcw/cubicweb/devtools/repotest.py", line 340, in _build_variantes variantes = _orig_build_variantes(self, newsolutions) File "/home/pyves/src/fcw/cubicweb/rqlrewrite.py", line 470, in build_variantes variante.append( (key, sol[newvar]) ) KeyError: u'D' This happen because the mechanism removing unsupported snipset does not remove entry in ``self.rewritten`` when it removes entry from ``self.select.defined_vars``. Iteration on ``self.rewritten`` then crash because values of ``rewritten`` are expected to be found in solution.

     1

This package was debianized by Logilab <contact@logilab.fr>.

     2

It was downloaded from ftp://ftp.logilab.org/pub/cubicweb

     3

     4

     5

Upstream Author:

     6

     7

    Logilab <contact@logilab.fr>

     8

     9

Copyright:

    10

    11

    Copyright (c) 2003-2011 LOGILAB S.A. (Paris, FRANCE).

    12

    http://www.logilab.fr/ -- mailto:contact@logilab.fr

    13

    14

License:

    15

    16

    This program is free software; you can redistribute it and/or modify it

    17

    under the terms of the GNU Lesser General Public License as published by the

    18

    Free Software Foundation; either version 2.1 of the License, or (at your

    19

    option) any later version.

    20

    21

    This program is distributed in the hope that it will be useful, but WITHOUT

    22

    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

    23

    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License

    24

    for more details.

    25

    26

    You should have received a copy of the GNU Lessser General Public License

    27

    along with this program; if not, write to the Free Software Foundation,

    28

    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.

    29

    30

On Debian systems, the complete text of the GNU Lesser General Public License

    31

may be found in '/usr/share/common-licenses/LGPL-2.1'.