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
3 changes: 3 additions & 0 deletions internal/stackql/astvisit/fragment_rewriting.go
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,9 @@ func (v *standardFragmentRewriteAstVisitor) Visit(node sqlparser.SQLNode) error
buf.WriteString(funcName)
}
buf.AstPrintf(node, "(%s%v)", distinct, node.Exprs)
if node.Over != nil {
buf.AstPrintf(node, " %v", node.Over)
}
v.rewrittenQuery = buf.String()

case *sqlparser.GroupConcatExpr:
Expand Down
3 changes: 3 additions & 0 deletions internal/stackql/astvisit/from_rewrite.go
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,9 @@ func (v *standardFromRewriteAstVisitor) Visit(node sqlparser.SQLNode) error {
buf.WriteString(funcName)
}
buf.AstPrintf(node, "(%s%v)", distinct, node.Exprs)
if node.Over != nil {
buf.AstPrintf(node, " %v", node.Over)
}
v.rewrittenQuery = buf.String()

case *sqlparser.GroupConcatExpr:
Expand Down
3 changes: 3 additions & 0 deletions internal/stackql/astvisit/provider_string_extract.go
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,9 @@ func (v *standardProviderStringAstVisitor) Visit(node sqlparser.SQLNode) error {
buf.WriteString(funcName)
}
buf.AstPrintf(node, "(%s%v)", distinct, node.Exprs)
if node.Over != nil {
buf.AstPrintf(node, " %v", node.Over)
}
// v.rewrittenQuery = buf.String()

case *sqlparser.GroupConcatExpr:
Expand Down
9 changes: 8 additions & 1 deletion internal/stackql/parserutil/parser_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,14 @@ func inferColNameFromExpr(
exprsDecorated = append(exprsDecorated, rv.DecoratedColumn)
}
}
decoratedColumn := fmt.Sprintf("%s(%s)", funcNameLowered, strings.Join(exprsDecorated, ", "))
// Use astformat.String for window functions to include OVER clause,
// otherwise use the manually constructed decorated column for proper arg handling
var decoratedColumn string
if expr.Over != nil {
decoratedColumn = astformat.String(expr, formatter)
} else {
decoratedColumn = fmt.Sprintf("%s(%s)", funcNameLowered, strings.Join(exprsDecorated, ", "))
}
if retVal.Name != constants.SQLFuncJSONExtractPostgres {
retVal.DecoratedColumn = getDecoratedColRendition(decoratedColumn, alias)
}
Expand Down
Loading