change "where" clause of agg functions to "filter" #6465
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit changes the "where <expr>" clause on agg functions to use the SQL syntax "filter ( <expr> )". While we were here, we change ast.Agg to ast.AggFunc, removed the Where field from ast.CallExpr, and cleaned up the grammar for how agg functions are integrated into expressions and shortcuts. We also fixed a big where "count(*) where ..." did not previously parse, but "count(*) filter ( ... )" now works.
nwt
approved these changes
Dec 23, 2025
compiler/ast/op.go
Outdated
| // upon a function of the record, e.g., count() counts up records without | ||
| // looking into them. | ||
| type Agg struct { | ||
| type AggFunc struct { |
Member
There was a problem hiding this comment.
Nit: While you're here, maybe move this to expr.go?
Collaborator
Author
There was a problem hiding this comment.
Also gonna call it AggFuncExpr
compiler/parser/parser.peg
Outdated
|
|
||
| FilterClause = _ FILTER __ "(" __ expr:LogicalOrExpr __ ")" { return expr, nil } | ||
|
|
||
| WhereClause = _ WHERE _ expr:LogicalOrExpr { return expr, nil } |
Member
There was a problem hiding this comment.
Nit: Since this is now used only in FromSelect and Select, maybe move it down where OptWhereClause used to live?
compiler/parser/support.go
Outdated
|
|
||
| func newCall(c *current, name, args, where any) ast.Expr { | ||
| func newCall(c *current, name, args any) ast.Expr { | ||
| call := &ast.CallExpr{ |
Member
There was a problem hiding this comment.
Nit:
Suggested change
| call := &ast.CallExpr{ | |
| return &ast.CallExpr{ |
compiler/semantic/op.go
Outdated
| }, | ||
| } | ||
| values := sem.NewValues(agg, sem.NewThis(agg, []string{name})) | ||
| return append(append(seq, aggregate), values) |
Member
There was a problem hiding this comment.
Nit:
Suggested change
| return append(append(seq, aggregate), values) | |
| return append(seq, aggregate, values) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit changes the "where " clause on agg functions to use the SQL syntax "filter ( )".
While we were here, we changed ast.Agg to ast.AggFunc, removed the Where field from ast.CallExpr, and cleaned up the grammar for how agg functions are integrated into expressions and shortcuts.
We also fixed a big where "count() where ..." did not previously parse, but "count() filter ( ... )" now works.
Fixes #6261