Skip to content

parser: Add support for simple case expressions #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions internal/dinosql/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,31 @@ func outputColumns(c core.Catalog, node nodes.Node) ([]core.Column, error) {
cols = append(cols, core.Column{Name: name, DataType: "any", NotNull: false})
}

case nodes.CaseExpr:
name := ""
if res.Name != nil {
name = *res.Name
}
// TODO: The TypeCase code has been copied from below. Instead, we need a recurse function to get the type of a node.
if tc, ok := n.Defresult.(nodes.TypeCast); ok {
if tc.TypeName == nil {
return nil, errors.New("no type name type cast")
}
name := ""
if ref, ok := tc.Arg.(nodes.ColumnRef); ok {
name = join(ref.Fields, "_")
}
if res.Name != nil {
name = *res.Name
}
// TODO Validate column names
col := catalog.ToColumn(tc.TypeName)
col.Name = name
cols = append(cols, col)
} else {
cols = append(cols, core.Column{Name: name, DataType: "any", NotNull: false})
}

case nodes.CoalesceExpr:
for _, arg := range n.Args.Items {
if ref, ok := arg.(nodes.ColumnRef); ok {
Expand Down Expand Up @@ -652,6 +677,14 @@ func outputColumns(c core.Catalog, node nodes.Node) ([]core.Column, error) {
col := catalog.ToColumn(n.TypeName)
col.Name = name
cols = append(cols, col)

default:
name := ""
if res.Name != nil {
name = *res.Name
}
cols = append(cols, core.Column{Name: name, DataType: "any", NotNull: false})

}
}
return cols, nil
Expand Down
19 changes: 19 additions & 0 deletions internal/dinosql/query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,25 @@ func TestQueries(t *testing.T) {
},
},
},
{
"case-stmt-bool",
`
CREATE TABLE foo (id text not null);
SELECT CASE
WHEN id = $1 THEN true
ELSE false
END is_one
FROM foo;
`,
Query{
Params: []Parameter{
{1, core.Column{Table: public("foo"), Name: "id", DataType: "text", NotNull: true}},
},
Columns: []core.Column{
{Name: "is_one", DataType: "pg_catalog.bool", NotNull: true},
},
},
},
} {
test := tc
t.Run(test.name, func(t *testing.T) {
Expand Down