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

[MESSAGES CONTROL]

     2

disable-msg = C0301

     3

     4

[VARIABLES]

     5

# Enable / disable this checker

     6

enable-variables = yes

     7

additional-builtins = _, display_name

     8

     9

[BASIC]

    10

required-attributes=

    11

attr-rgx = (w|[a-z_][a-z0-9_]{2,30})

    12

variable-rgx = (w|[a-z_][a-z0-9_]{2,30})$

    13

argument-rgx = (w|[a-z_][a-z0-9_]{2,30})$

    14

    15

[TYPECHECK]

    16

generated-members=debug,info,notice,warning,error,critical,exception