diff options
| author | Noah Misch | 2013-07-17 00:15:36 +0000 |
|---|---|---|
| committer | Noah Misch | 2013-07-17 00:15:36 +0000 |
| commit | b560ec1b0d7b910ce13edc51ffaafaca72136e3b (patch) | |
| tree | ae5d80c94681788fd214efe6d61425089850781e /src/include/parser | |
| parent | 7a8e9f298e7b8158296e1ea72ca8987323c10edf (diff) | |
Implement the FILTER clause for aggregate function calls.
This is SQL-standard with a few extensions, namely support for
subqueries and outer references in clause expressions.
catversion bump due to change in Aggref and WindowFunc.
David Fetter, reviewed by Dean Rasheed.
Diffstat (limited to 'src/include/parser')
| -rw-r--r-- | src/include/parser/kwlist.h | 1 | ||||
| -rw-r--r-- | src/include/parser/parse_func.h | 7 | ||||
| -rw-r--r-- | src/include/parser/parse_node.h | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h index b3d72a9ae3b..287f78e72a6 100644 --- a/src/include/parser/kwlist.h +++ b/src/include/parser/kwlist.h @@ -155,6 +155,7 @@ PG_KEYWORD("extract", EXTRACT, COL_NAME_KEYWORD) PG_KEYWORD("false", FALSE_P, RESERVED_KEYWORD) PG_KEYWORD("family", FAMILY, UNRESERVED_KEYWORD) PG_KEYWORD("fetch", FETCH, RESERVED_KEYWORD) +PG_KEYWORD("filter", FILTER, UNRESERVED_KEYWORD) PG_KEYWORD("first", FIRST_P, UNRESERVED_KEYWORD) PG_KEYWORD("float", FLOAT_P, COL_NAME_KEYWORD) PG_KEYWORD("following", FOLLOWING, UNRESERVED_KEYWORD) diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index 6e09dc46452..d63cb95b347 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -42,10 +42,9 @@ typedef enum } FuncDetailCode; -extern Node *ParseFuncOrColumn(ParseState *pstate, - List *funcname, List *fargs, - List *agg_order, bool agg_star, bool agg_distinct, - bool func_variadic, +extern Node *ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, + List *agg_order, Expr *agg_filter, + bool agg_star, bool agg_distinct, bool func_variadic, WindowDef *over, bool is_column, int location); extern FuncDetailCode func_get_detail(List *funcname, diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 49ca7645d40..bea3b073e55 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -39,6 +39,7 @@ typedef enum ParseExprKind EXPR_KIND_FROM_FUNCTION, /* function in FROM clause */ EXPR_KIND_WHERE, /* WHERE */ EXPR_KIND_HAVING, /* HAVING */ + EXPR_KIND_FILTER, /* FILTER */ EXPR_KIND_WINDOW_PARTITION, /* window definition PARTITION BY */ EXPR_KIND_WINDOW_ORDER, /* window definition ORDER BY */ EXPR_KIND_WINDOW_FRAME_RANGE, /* window frame clause with RANGE */ |