compiler: Validate function calls (#505)

Author: kyleconroy

internal/compiler/runtime/parse.go

@@ -46,6 +46,9 @@ func parseQuery(c *catalog.Catalog, stmt ast.Node, src string, rewriteParameters
 	if rawSQL == "" {
 		return nil, errors.New("missing semicolon at end of file")
 	}
+	if err := validate.FuncCall(c, raw); err != nil {
+		return nil, err
+	}
 
 	return &Query{}, nil
 }

internal/postgresql/convert.go

@@ -1538,11 +1538,17 @@ func convertFromExpr(n *nodes.FromExpr) *pg.FromExpr {
 	}
 }
 
-func convertFuncCall(n *nodes.FuncCall) *pg.FuncCall {
+func convertFuncCall(n *nodes.FuncCall) *ast.FuncCall {
 	if n == nil {
 		return nil
 	}
-	return &pg.FuncCall{
+	fn, err := parseFuncName(n.Funcname)
+	if err != nil {
+		// TODO: How should we handle errors?
+		panic(err)
+	}
+	return &ast.FuncCall{
+		Func:           fn,
 		Funcname:       convertList(n.Funcname),
 		Args:           convertList(n.Args),
 		AggOrder:       convertList(n.AggOrder),
@@ -2839,11 +2845,11 @@ func convertWindowClause(n *nodes.WindowClause) *pg.WindowClause {
 	}
 }
 
-func convertWindowDef(n *nodes.WindowDef) *pg.WindowDef {
+func convertWindowDef(n *nodes.WindowDef) *ast.WindowDef {
 	if n == nil {
 		return nil
 	}
-	return &pg.WindowDef{
+	return &ast.WindowDef{
 		Name:            n.Name,
 		Refname:         n.Refname,
 		PartitionClause: convertList(n.PartitionClause),

internal/postgresql/rewrite_test.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/kyleconroy/sqlc/internal/sql/ast"
 	"github.com/kyleconroy/sqlc/internal/sql/ast/pg"
 	"github.com/kyleconroy/sqlc/internal/sql/astutils"
 
@@ -24,7 +25,7 @@ func TestApply(t *testing.T) {
 
 	expect := &output[0]
 	actual := astutils.Apply(&input[0], func(cr *astutils.Cursor) bool {
-		fun, ok := cr.Node().(*pg.FuncCall)
+		fun, ok := cr.Node().(*ast.FuncCall)
 		if !ok {
 			return true
 		}

internal/sql/ast/pg/func_call.go internal/sql/ast/func_call.gointernal/sql/ast/pg/func_call.go renamed to internal/sql/ast/func_call.go

@@ -1,14 +1,11 @@
-package pg
-
-import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-)
+package ast
 
 type FuncCall struct {
-	Funcname       *ast.List
-	Args           *ast.List
-	AggOrder       *ast.List
-	AggFilter      ast.Node
+	Func           *FuncName
+	Funcname       *List
+	Args           *List
+	AggOrder       *List
+	AggFilter      Node
 	AggWithinGroup bool
 	AggStar        bool
 	AggDistinct    bool

internal/sql/ast/pg/window_def.go

@@ -0,0 +1,16 @@
+package ast
+
+type WindowDef struct {
+	Name            *string
+	Refname         *string
+	PartitionClause *List
+	OrderClause     *List
+	FrameOptions    int
+	StartOffset     Node
+	EndOffset       Node
+	Location        int
+}
+
+func (n *WindowDef) Pos() int {
+	return n.Location
+}

internal/sql/ast/window_def.go

@@ -760,7 +760,8 @@ func (a *application) apply(parent ast.Node, name string, iter *iterator, n ast.
 		a.apply(n, "Fromlist", nil, n.Fromlist)
 		a.apply(n, "Quals", nil, n.Quals)
 
-	case *pg.FuncCall:
+	case *ast.FuncCall:
+		a.apply(n, "Func", nil, n.Func)
 		a.apply(n, "Funcname", nil, n.Funcname)
 		a.apply(n, "Args", nil, n.Args)
 		a.apply(n, "AggOrder", nil, n.AggOrder)
@@ -1206,7 +1207,7 @@ func (a *application) apply(parent ast.Node, name string, iter *iterator, n ast.
 		a.apply(n, "StartOffset", nil, n.StartOffset)
 		a.apply(n, "EndOffset", nil, n.EndOffset)
 
-	case *pg.WindowDef:
+	case *ast.WindowDef:
 		a.apply(n, "PartitionClause", nil, n.PartitionClause)
 		a.apply(n, "OrderClause", nil, n.OrderClause)
 		a.apply(n, "StartOffset", nil, n.StartOffset)

internal/sql/astutils/rewrite.go

@@ -645,7 +645,8 @@ func Walk(f Visitor, node ast.Node) {
 		walkn(f, n.Fromlist)
 		walkn(f, n.Quals)
 
-	case *pg.FuncCall:
+	case *ast.FuncCall:
+		walkn(f, n.Func)
 		walkn(f, n.Funcname)
 		walkn(f, n.Args)
 		walkn(f, n.AggOrder)
@@ -1091,7 +1092,7 @@ func Walk(f Visitor, node ast.Node) {
 		walkn(f, n.StartOffset)
 		walkn(f, n.EndOffset)
 
-	case *pg.WindowDef:
+	case *ast.WindowDef:
 		walkn(f, n.PartitionClause)
 		walkn(f, n.OrderClause)
 		walkn(f, n.StartOffset)

internal/sql/astutils/walk.go

@@ -0,0 +1,25 @@
+package catalog
+
+import (
+	"github.com/kyleconroy/sqlc/internal/sql/ast"
+)
+
+// TODO: Decide on a real, exported interface
+func (c *Catalog) ListFuncsByName(rel *ast.FuncName) ([]Function, error) {
+	var funcs []Function
+
+	ns := rel.Schema
+	if ns == "" {
+		ns = c.DefaultSchema
+	}
+	s, err := c.getSchema(ns)
+	if err != nil {
+		return nil, err
+	}
+	for i := range s.Funcs {
+		if s.Funcs[i].Name == rel.Name {
+			funcs = append(funcs, *s.Funcs[i])
+		}
+	}
+	return funcs, nil
+}

internal/sql/catalog/public.go

@@ -7,8 +7,14 @@ import (
 )
 
 func IsParamFunc(node ast.Node) bool {
-	fun, ok := node.(*pg.FuncCall)
-	return ok && astutils.Join(fun.Funcname, ".") == "sqlc.arg"
+	call, ok := node.(*ast.FuncCall)
+	if !ok {
+		return false
+	}
+	if call.Func == nil {
+		return false
+	}
+	return call.Func.Schema == "sqlc" && call.Func.Name == "arg"
 }
 
 func IsParamSign(node ast.Node) bool {