Skip to content
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
18 changes: 16 additions & 2 deletions internal/dinosql/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -755,8 +755,12 @@ func sourceTables(qc *QueryCatalog, node nodes.Node) ([]core.Table, error) {
}
case nodes.SelectStmt:
list = search(n.FromClause, func(node nodes.Node) bool {
_, ok := node.(nodes.RangeVar)
return ok
switch node.(type) {
case nodes.RangeVar, nodes.RangeSubselect:
return true
default:
return false
}
})
case nodes.TruncateStmt:
list = search(n.Relations, func(node nodes.Node) bool {
Expand All @@ -774,6 +778,16 @@ func sourceTables(qc *QueryCatalog, node nodes.Node) ([]core.Table, error) {
var tables []core.Table
for _, item := range list.Items {
switch n := item.(type) {
case nodes.RangeSubselect:
cols, err := outputColumns(qc, n.Subquery)
if err != nil {
return nil, err
}
tables = append(tables, core.Table{
Name: *n.Alias.Aliasname,
Columns: cols,
})

case nodes.RangeVar:
fqn, err := catalog.ParseRange(&n)
if err != nil {
Expand Down
29 changes: 29 additions & 0 deletions internal/endtoend/testdata/subquery_calculated_column/go/db.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions internal/endtoend/testdata/subquery_calculated_column/go/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CREATE TABLE foo (a int, b int);

-- name: SubqueryCalcColumn :many
SELECT sum FROM (SELECT a + b AS sum FROM foo) AS f;
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"version": "1",
"packages": [{
"path": "go",
"name": "querytest",
"schema": "query.sql",
"queries": "query.sql"
}]
}