Fix handling of inserts with both unless conflict and a with block #1291
Conversation
| childExprs.push( | ||
| ...walkExprTree(expr.__expr__, parentScope, ctx), | ||
| ...insertChildExprs, | ||
| ); |
There was a problem hiding this comment.
I’m typing this out to ensure I understand the fix here:
In a previous with extraction fix, we extracted child expressions from the unlessConflict expression and stored them in the insertChildExprs array. However, we didn’t add these child expressions to the parent (insert) expression’s child expression list. Consequently, when the expression -> query machinery was validating the with access, it was not able to see that these expressions were allowed.
There was a problem hiding this comment.
Almost, we did add the insertChildExprs to the wrapped insert expr, but not the unless conflict wrapper expr. The real issue was we weren't recording that the insert expr (and its children) were child exprs of the unless conflict expr, so it couldn't see in the scope validation step that the child exprs in the insert expr that appeared in the with block were also children of the unless conflict expr.
The insertChildExprs thing is slightly different, and is to assign the exprs in the unless conflict clause as children of the insert expr instead of the unless conflict wrapper expr. Which I think if I remember right is to fix some other issue where something gets confused if the exprs in the conflict clause reference the insert expr, and that appears to be a sibling expr (as it does if both were children of the unless conflict wrapper)...?
Fixes #788, and should also fix #679