Skip to content

fix: accept SELECT-list trailing commas at query boundaries #405

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.

Sign up for GitHub

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
makenowjust merged 1 commit into from
Aug 16, 2026
Merged

fix: accept SELECT-list trailing commas at query boundaries #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ func (p *Parser) parseSelectResults() []ast.SelectItem {
break
}
p.nextToken()
if p.Token.Kind == token.TokenEOF || p.Token.Kind == "FROM" {
if p.Token.Kind == token.TokenEOF || p.Token.Kind == "FROM" || p.Token.Kind == ")" || p.Token.Kind == "|>" {
break
}
results = append(results, p.parseSelectItem())
Expand Down
3 changes: 3 additions & 0 deletions testdata/input/query/pipe_select_trailing_comma.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(FROM UNNEST([1]) AS x |> SELECT x,)
|> SELECT x,
|> WHERE TRUE
1 change: 1 addition & 0 deletions testdata/input/query/select_trailing_comma_subqueries.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(SELECT EXISTS(SELECT 1,), ARRAY(SELECT 2,),)
83 changes: 83 additions & 0 deletions testdata/result/query/pipe_select_trailing_comma.sql.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
--- pipe_select_trailing_comma.sql
(FROM UNNEST([1]) AS x |> SELECT x,)
|> SELECT x,
|> WHERE TRUE

--- AST
&ast.QueryStatement{
Query: &ast.Query{
Query: &ast.SubQuery{
Rparen: 35,
Query: &ast.Query{
Query: &ast.FromQuery{
From: &ast.From{
From: 1,
Source: &ast.Unnest{
Unnest: 6,
Rparen: 16,
Expr: &ast.ArrayLiteral{
Array: -1,
Lbrack: 13,
Rbrack: 15,
Values: []ast.Expr{
&ast.IntLiteral{
ValuePos: 14,
ValueEnd: 15,
Base: 10,
Value: "1",
},
},
},
As: &ast.AsAlias{
As: 18,
Alias: &ast.Ident{
NamePos: 21,
NameEnd: 22,
Name: "x",
},
},
},
},
},
PipeOperators: []ast.PipeOperator{
&ast.PipeSelect{
Pipe: 23,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.Ident{
NamePos: 33,
NameEnd: 34,
Name: "x",
},
},
},
},
},
},
},
PipeOperators: []ast.PipeOperator{
&ast.PipeSelect{
Pipe: 37,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.Ident{
NamePos: 47,
NameEnd: 48,
Name: "x",
},
},
},
},
&ast.PipeWhere{
Pipe: 50,
Expr: &ast.BoolLiteral{
ValuePos: 59,
Value: true,
},
},
},
},
}

--- SQL
(FROM UNNEST([1]) AS x |> SELECT x) |> SELECT x |> WHERE TRUE
55 changes: 55 additions & 0 deletions testdata/result/query/select_trailing_comma_subqueries.sql.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
--- select_trailing_comma_subqueries.sql
(SELECT EXISTS(SELECT 1,), ARRAY(SELECT 2,),)

--- AST
&ast.QueryStatement{
Query: &ast.SubQuery{
Rparen: 44,
Query: &ast.Select{
Select: 1,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.ExistsSubQuery{
Exists: 8,
Rparen: 24,
Query: &ast.Select{
Select: 15,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.IntLiteral{
ValuePos: 22,
ValueEnd: 23,
Base: 10,
Value: "1",
},
},
},
},
},
},
&ast.ExprSelectItem{
Expr: &ast.ArraySubQuery{
Array: 27,
Rparen: 42,
Query: &ast.Select{
Select: 33,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.IntLiteral{
ValuePos: 40,
ValueEnd: 41,
Base: 10,
Value: "2",
},
},
},
},
},
},
},
},
},
}

--- SQL
(SELECT EXISTS(SELECT 1), ARRAY(SELECT 2))
83 changes: 83 additions & 0 deletions testdata/result/statement/pipe_select_trailing_comma.sql.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
--- pipe_select_trailing_comma.sql
(FROM UNNEST([1]) AS x |> SELECT x,)
|> SELECT x,
|> WHERE TRUE

--- AST
&ast.QueryStatement{
Query: &ast.Query{
Query: &ast.SubQuery{
Rparen: 35,
Query: &ast.Query{
Query: &ast.FromQuery{
From: &ast.From{
From: 1,
Source: &ast.Unnest{
Unnest: 6,
Rparen: 16,
Expr: &ast.ArrayLiteral{
Array: -1,
Lbrack: 13,
Rbrack: 15,
Values: []ast.Expr{
&ast.IntLiteral{
ValuePos: 14,
ValueEnd: 15,
Base: 10,
Value: "1",
},
},
},
As: &ast.AsAlias{
As: 18,
Alias: &ast.Ident{
NamePos: 21,
NameEnd: 22,
Name: "x",
},
},
},
},
},
PipeOperators: []ast.PipeOperator{
&ast.PipeSelect{
Pipe: 23,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.Ident{
NamePos: 33,
NameEnd: 34,
Name: "x",
},
},
},
},
},
},
},
PipeOperators: []ast.PipeOperator{
&ast.PipeSelect{
Pipe: 37,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.Ident{
NamePos: 47,
NameEnd: 48,
Name: "x",
},
},
},
},
&ast.PipeWhere{
Pipe: 50,
Expr: &ast.BoolLiteral{
ValuePos: 59,
Value: true,
},
},
},
},
}

--- SQL
(FROM UNNEST([1]) AS x |> SELECT x) |> SELECT x |> WHERE TRUE
55 changes: 55 additions & 0 deletions testdata/result/statement/select_trailing_comma_subqueries.sql.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
--- select_trailing_comma_subqueries.sql
(SELECT EXISTS(SELECT 1,), ARRAY(SELECT 2,),)

--- AST
&ast.QueryStatement{
Query: &ast.SubQuery{
Rparen: 44,
Query: &ast.Select{
Select: 1,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.ExistsSubQuery{
Exists: 8,
Rparen: 24,
Query: &ast.Select{
Select: 15,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.IntLiteral{
ValuePos: 22,
ValueEnd: 23,
Base: 10,
Value: "1",
},
},
},
},
},
},
&ast.ExprSelectItem{
Expr: &ast.ArraySubQuery{
Array: 27,
Rparen: 42,
Query: &ast.Select{
Select: 33,
Results: []ast.SelectItem{
&ast.ExprSelectItem{
Expr: &ast.IntLiteral{
ValuePos: 40,
ValueEnd: 41,
Base: 10,
Value: "2",
},
},
},
},
},
},
},
},
},
}

--- SQL
(SELECT EXISTS(SELECT 1), ARRAY(SELECT 2))
Loading