]> granicus.if.org Git - postgresql/commit
Centralize the logic for detecting misplaced aggregates, window funcs, etc.
authorTom Lane <tgl@sss.pgh.pa.us>
Fri, 10 Aug 2012 15:35:33 +0000 (11:35 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Fri, 10 Aug 2012 15:36:15 +0000 (11:36 -0400)
commiteaccfded98a9c677d3a2e849c1747ec90e8596a6
treec341448f69a2e67484de7a0a43e12848c20eb414
parentb3055ab4fb5839a872bfe354b2b5ac31e6903ed6
Centralize the logic for detecting misplaced aggregates, window funcs, etc.

Formerly we relied on checking after-the-fact to see if an expression
contained aggregates, window functions, or sub-selects when it shouldn't.
This is grotty, easily forgotten (indeed, we had forgotten to teach
DefineIndex about rejecting window functions), and none too efficient
since it requires extra traversals of the parse tree.  To improve matters,
define an enum type that classifies all SQL sub-expressions, store it in
ParseState to show what kind of expression we are currently parsing, and
make transformAggregateCall, transformWindowFuncCall, and transformSubLink
check the expression type and throw error if the type indicates the
construct is disallowed.  This allows removal of a large number of ad-hoc
checks scattered around the code base.  The enum type is sufficiently
fine-grained that we can still produce error messages of at least the
same specificity as before.

Bringing these error checks together revealed that we'd been none too
consistent about phrasing of the error messages, so standardize the wording
a bit.

Also, rewrite checking of aggregate arguments so that it requires only one
traversal of the arguments, rather than up to three as before.

In passing, clean up some more comments left over from add_missing_from
support, and annotate some tests that I think are dead code now that that's
gone.  (I didn't risk actually removing said dead code, though.)
29 files changed:
src/backend/catalog/heap.c
src/backend/commands/functioncmds.c
src/backend/commands/indexcmds.c
src/backend/commands/prepare.c
src/backend/commands/tablecmds.c
src/backend/commands/trigger.c
src/backend/commands/typecmds.c
src/backend/optimizer/util/clauses.c
src/backend/optimizer/util/var.c
src/backend/parser/analyze.c
src/backend/parser/parse_agg.c
src/backend/parser/parse_clause.c
src/backend/parser/parse_expr.c
src/backend/parser/parse_node.c
src/backend/parser/parse_target.c
src/backend/parser/parse_utilcmd.c
src/backend/rewrite/rewriteManip.c
src/include/optimizer/var.h
src/include/parser/parse_agg.h
src/include/parser/parse_clause.h
src/include/parser/parse_expr.h
src/include/parser/parse_node.h
src/include/parser/parse_target.h
src/include/rewrite/rewriteManip.h
src/test/regress/expected/aggregates.out
src/test/regress/expected/join.out
src/test/regress/expected/window.out
src/test/regress/expected/with.out
src/test/regress/sql/aggregates.sql