Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
parser: Return error if missing RETURNING
If a query specifies a return value (:one or :many), require that statements have a RETURNING clause. Fixes #121
  • Loading branch information
kyleconroy committed Nov 18, 2019
commit 21ef4093c944f27a21595a3d0c4a53a8dd59c207
28 changes: 27 additions & 1 deletion internal/dinosql/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,30 @@ func parseMetadata(t string) (string, string, error) {
return "", "", nil
}

func validateCmd(n nodes.Node, name, cmd string) error {
// TODO: Convert cmd to an enum
if !(cmd == ":many" || cmd == ":one") {
return nil
}
var list nodes.List
switch stmt := n.(type) {
case nodes.SelectStmt:
return nil
case nodes.DeleteStmt:
list = stmt.ReturningList
case nodes.InsertStmt:
list = stmt.ReturningList
case nodes.UpdateStmt:
list = stmt.ReturningList
default:
return nil
}
if len(list.Items) == 0 {
return fmt.Errorf("query %q specifies parameter %q without containing a RETURNING clause", name, cmd)
}
return nil
}

func parseQuery(c core.Catalog, stmt nodes.Node, source string) (*Query, error) {
if err := validateParamRef(stmt); err != nil {
return nil, err
Expand Down Expand Up @@ -366,7 +390,9 @@ func parseQuery(c core.Catalog, stmt nodes.Node, source string) (*Query, error)
if err != nil {
return nil, err
}

if err := validateCmd(raw.Stmt, name, cmd); err != nil {
return nil, err
}
rvs := rangeVars(raw.Stmt)
refs := findParameters(raw.Stmt)
params, err := resolveCatalogRefs(c, rvs, refs)
Expand Down
7 changes: 7 additions & 0 deletions internal/dinosql/query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,13 @@ func TestInvalidQueries(t *testing.T) {
SELECT id FROM foo;
`,
},
{
`
CREATE TABLE foo (id text not null);
-- name: DeleteFoo :one
DELETE FROM foo WHERE id = $1;
`,
},
} {
test := tc
t.Run(strconv.Itoa(i), func(t *testing.T) {
Expand Down