Skip to content

Commit

Permalink
Make it possible to rewrite function calls inside function calls
Browse files Browse the repository at this point in the history
Signed-off-by: Andres Taylor <andres@planetscale.com>
  • Loading branch information
systay committed Jun 9, 2020
1 parent 945e105 commit eb01da2
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 19 deletions.
40 changes: 21 additions & 19 deletions go/vt/sqlparser/expression_rewriting.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,26 +132,28 @@ const (
func (er *expressionRewriter) goingDown(cursor *Cursor) bool {
switch node := cursor.Node().(type) {
// select last_insert_id() -> select :__lastInsertId as `last_insert_id()`
case *AliasedExpr:
if node.As.IsEmpty() {
buf := NewTrackedBuffer(nil)
node.Expr.Format(buf)
inner := newExpressionRewriter()
inner.shouldRewriteDatabaseFunc = er.shouldRewriteDatabaseFunc
tmp := Rewrite(node.Expr, inner.goingDown, nil)
newExpr, ok := tmp.(Expr)
if !ok {
log.Errorf("failed to rewrite AST. function expected to return Expr returned a %s", String(tmp))
return false
case *Select:
for _, col := range node.SelectExprs {
aliasedExpr, ok := col.(*AliasedExpr)
if ok && aliasedExpr.As.IsEmpty() {
buf := NewTrackedBuffer(nil)
aliasedExpr.Expr.Format(buf)
inner := newExpressionRewriter()
inner.shouldRewriteDatabaseFunc = er.shouldRewriteDatabaseFunc
tmp := Rewrite(aliasedExpr.Expr, inner.goingDown, nil)
newExpr, ok := tmp.(Expr)
if !ok {
log.Errorf("failed to rewrite AST. function expected to return Expr returned a %s", String(tmp))
return false
}
aliasedExpr.Expr = newExpr
if inner.didAnythingChange() {
aliasedExpr.As = NewColIdent(buf.String())
}
for k := range inner.bindVars {
er.needBindVarFor(k)
}
}
node.Expr = newExpr
if inner.didAnythingChange() {
node.As = NewColIdent(buf.String())
}
for k := range inner.bindVars {
er.needBindVarFor(k)
}
return false
}
case *FuncExpr:
er.funcRewrite(cursor, node)
Expand Down
5 changes: 5 additions & 0 deletions go/vt/sqlparser/expression_rewriting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ func TestRewrites(in *testing.T) {
expected: "select :__vtrcount as `row_count()`",
rowCount: true,
},
{
in: "SELECT lower(database())",
expected: "SELECT lower(:__vtdbname) as `lower(database())`",
db: true,
},
}

for _, tc := range tests {
Expand Down

0 comments on commit eb01da2

Please sign in to comment.