Added postgres CALL support (#1495)

* Added postgres CALL support * Regenerated endtoend * Converted FuncCall to a pointer
sqlc-dev · Mar 25, 2022 · 582ba6e · 582ba6e
1 parent 0897308
commit 582ba6e
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 16 deletions.
diff --git a/internal/compiler/find_params.go b/internal/compiler/find_params.go
@@ -66,6 +66,9 @@ func (p paramSearch) Visit(node ast.Node) astutils.Visitor {
 	case *ast.BetweenExpr:
 		p.parent = node
 
+	case *ast.CallStmt:
+		p.parent = n.FuncCall
+
 	case *ast.FuncCall:
 		p.parent = node
 

diff --git a/internal/compiler/output_columns.go b/internal/compiler/output_columns.go
@@ -83,6 +83,8 @@ func outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, error) {
 		if len(targets.Items) == 0 && n.Larg != nil {
 			return outputColumns(qc, n.Larg)
 		}
+	case *ast.CallStmt:
+		targets = &ast.List{}
 	case *ast.TruncateStmt:
 		targets = &ast.List{}
 	case *ast.UpdateStmt:
@@ -386,6 +388,8 @@ func sourceTables(qc *QueryCatalog, node ast.Node) ([]*Table, error) {
 		list = &ast.List{
 			Items: append(n.FromClause.Items, n.Relations.Items...),
 		}
+	case *ast.CallStmt:
+		list = &ast.List{}
 	default:
 		return nil, fmt.Errorf("sourceTables: unsupported node type: %T", n)
 	}

diff --git a/internal/compiler/parse.go b/internal/compiler/parse.go
@@ -48,6 +48,7 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
 	}
 	var table *ast.TableName
 	switch n := raw.Stmt.(type) {
+	case *ast.CallStmt:
 	case *ast.SelectStmt:
 	case *ast.DeleteStmt:
 	case *ast.InsertStmt:

diff --git a/internal/endtoend/testdata/ddl_create_procedure/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/ddl_create_procedure/postgresql/pgx/go/query.sql.go
diff --git a/internal/endtoend/testdata/ddl_create_procedure/postgresql/pgx/query.sql b/internal/endtoend/testdata/ddl_create_procedure/postgresql/pgx/query.sql
@@ -1,6 +1,11 @@
--- name: Placeholder :exec
-SELECT 1;
+-- name: CallInsertData :exec
+CALL insert_data($1, $2);
 
--- FIXME: Implement CALL
--- name: CallInsertData :select
+-- name: CallInsertDataNoArgs :exec
 CALL insert_data(1, 2);
+
+-- name: CallInsertDataNamed :exec
+CALL insert_data(b => $1, a => $2);
+
+-- name: CallInsertDataSqlcArgs :exec
+CALL insert_data(sqlc.arg('foo'), sqlc.arg('bar'));
diff --git a/internal/endtoend/testdata/ddl_create_procedure/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_create_procedure/postgresql/stdlib/go/query.sql.go
diff --git a/internal/endtoend/testdata/ddl_create_procedure/postgresql/stdlib/query.sql b/internal/endtoend/testdata/ddl_create_procedure/postgresql/stdlib/query.sql
@@ -1,6 +1,11 @@
--- name: Placeholder :exec
-SELECT 1;
+-- name: CallInsertData :exec
+CALL insert_data($1, $2);
 
--- FIXME: Implement CALL
--- name: CallInsertData :select
+-- name: CallInsertDataNoArgs :exec
 CALL insert_data(1, 2);
+
+-- name: CallInsertDataNamed :exec
+CALL insert_data(b => $1, a => $2);
+
+-- name: CallInsertDataSqlcArgs :exec
+CALL insert_data(sqlc.arg('foo'), sqlc.arg('bar'));
diff --git a/internal/engine/postgresql/convert.go b/internal/engine/postgresql/convert.go
@@ -639,6 +639,33 @@ func convertBooleanTest(n *pg.BooleanTest) *ast.BooleanTest {
 	}
 }
 
+func convertCallStmt(n *pg.CallStmt) *ast.CallStmt {
+	if n == nil {
+		return nil
+	}
+	rel, err := parseRelationFromNodes(n.Funccall.Funcname)
+	if err != nil {
+		// TODO: How should we handle errors?
+		panic(err)
+	}
+
+	return &ast.CallStmt{
+		FuncCall: &ast.FuncCall{
+			Func:           rel.FuncName(),
+			Funcname:       convertSlice(n.Funccall.Funcname),
+			Args:           convertSlice(n.Funccall.Args),
+			AggOrder:       convertSlice(n.Funccall.AggOrder),
+			AggFilter:      convertNode(n.Funccall.AggFilter),
+			AggWithinGroup: n.Funccall.AggWithinGroup,
+			AggStar:        n.Funccall.AggStar,
+			AggDistinct:    n.Funccall.AggDistinct,
+			FuncVariadic:   n.Funccall.FuncVariadic,
+			Over:           convertWindowDef(n.Funccall.Over),
+			Location:       int(n.Funccall.Location),
+		},
+	}
+}
+
 func convertCaseExpr(n *pg.CaseExpr) *ast.CaseExpr {
 	if n == nil {
 		return nil
@@ -3092,6 +3119,9 @@ func convertNode(node *pg.Node) ast.Node {
 
 	case *pg.Node_BooleanTest:
 		return convertBooleanTest(n.BooleanTest)
+
+	case *pg.Node_CallStmt:
+		return convertCallStmt(n.CallStmt)
 
 	case *pg.Node_CaseExpr:
 		return convertCaseExpr(n.CaseExpr)

diff --git a/internal/sql/ast/call_stmt.go b/internal/sql/ast/call_stmt.go
@@ -0,0 +1,12 @@
+package ast
+
+type CallStmt struct {
+	FuncCall *FuncCall
+}
+
+func (n *CallStmt) Pos() int {
+	if n.FuncCall == nil {
+		return 0
+	}
+	return n.FuncCall.Pos()
+}
diff --git a/internal/sql/astutils/rewrite.go b/internal/sql/astutils/rewrite.go
@@ -414,6 +414,9 @@ func (a *application) apply(parent ast.Node, name string, iter *iterator, n ast.
 		a.apply(n, "Xpr", nil, n.Xpr)
 		a.apply(n, "Arg", nil, n.Arg)
 
+	case *ast.CallStmt:
+		a.apply(n, "FuncCall", nil, n.FuncCall)
+
 	case *ast.CaseExpr:
 		a.apply(n, "Xpr", nil, n.Xpr)
 		a.apply(n, "Arg", nil, n.Arg)

diff --git a/internal/sql/astutils/walk.go b/internal/sql/astutils/walk.go
@@ -511,6 +511,11 @@ func Walk(f Visitor, node ast.Node) {
 			Walk(f, n.Arg)
 		}
 
+	case *ast.CallStmt:
+		if n.FuncCall != nil {
+			Walk(f, n.FuncCall)
+		}
+
 	case *ast.CaseExpr:
 		if n.Xpr != nil {
 			Walk(f, n.Xpr)