diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/commands/vacuum.c | 6 | ||||
-rw-r--r-- | src/backend/parser/gram.y | 450 |
2 files changed, 453 insertions, 3 deletions
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 52158c75e6c..2592b2bec05 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.59 1998/01/31 04:38:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.60 1998/02/03 19:26:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -135,7 +135,9 @@ vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec) pmem = PortalGetVariableMemory(vc_portal); old = MemoryContextSwitchTo((MemoryContext) pmem); - Assert(va_spec == NIL || analyze); + if (va_spec == NIL || analyze) + elog(ERROR,"Can't vacuum columns, only tables. You can 'vacuum analyze' columns."); + foreach(le, va_spec) { char *col = (char *) lfirst(le); diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 5a847de14da..b3a6f73095b 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.102 1998/02/03 16:04:02 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.103 1998/02/03 19:26:41 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -2916,6 +2916,76 @@ row_expr: '(' row_descriptor ')' IN '(' SubSelect ')' n->subselect = $7; $$ = (Node *)n; } + | '(' row_descriptor ')' '+' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("+",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '-' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("-",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '/' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("/",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '*' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("*",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '<' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("<",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '>' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons(">",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '=' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("=",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } | '(' row_descriptor ')' Op ALL '(' SubSelect ')' { SubLink *n = makeNode(SubLink); @@ -2926,6 +2996,76 @@ row_expr: '(' row_descriptor ')' IN '(' SubSelect ')' n->subselect = $7; $$ = (Node *)n; } + | '(' row_descriptor ')' '+' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("+",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '-' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("-",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '/' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("/",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '*' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("*",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '<' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("<",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '>' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons(">",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '=' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("=",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $7; + $$ = (Node *)n; + } | '(' row_descriptor ')' Op '(' SubSelect ')' { SubLink *n = makeNode(SubLink); @@ -2939,10 +3079,108 @@ row_expr: '(' row_descriptor ')' IN '(' SubSelect ')' n->subselect = $6; $$ = (Node *)n; } + | '(' row_descriptor ')' '+' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("+", NIL); + n->useor = false; + n->subLinkType = EXPR_SUBLINK; + n->subselect = $6; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '-' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("-", NIL); + n->useor = false; + n->subLinkType = EXPR_SUBLINK; + n->subselect = $6; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '/' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("/", NIL); + n->useor = false; + n->subLinkType = EXPR_SUBLINK; + n->subselect = $6; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '*' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("*", NIL); + n->useor = false; + n->subLinkType = EXPR_SUBLINK; + n->subselect = $6; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '<' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("<", NIL); + n->useor = false; + n->subLinkType = EXPR_SUBLINK; + n->subselect = $6; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '>' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons(">", NIL); + n->useor = false; + n->subLinkType = EXPR_SUBLINK; + n->subselect = $6; + $$ = (Node *)n; + } + | '(' row_descriptor ')' '=' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = $2; + n->oper = lcons("=", NIL); + n->useor = false; + n->subLinkType = EXPR_SUBLINK; + n->subselect = $6; + $$ = (Node *)n; + } | '(' row_descriptor ')' Op '(' row_descriptor ')' { $$ = makeRowExpr($4, $2, $6); } + | '(' row_descriptor ')' '+' '(' row_descriptor ')' + { + $$ = makeRowExpr("+", $2, $6); + } + | '(' row_descriptor ')' '-' '(' row_descriptor ')' + { + $$ = makeRowExpr("-", $2, $6); + } + | '(' row_descriptor ')' '/' '(' row_descriptor ')' + { + $$ = makeRowExpr("/", $2, $6); + } + | '(' row_descriptor ')' '*' '(' row_descriptor ')' + { + $$ = makeRowExpr("*", $2, $6); + } + | '(' row_descriptor ')' '<' '(' row_descriptor ')' + { + $$ = makeRowExpr("<", $2, $6); + } + | '(' row_descriptor ')' '>' '(' row_descriptor ')' + { + $$ = makeRowExpr(">", $2, $6); + } + | '(' row_descriptor ')' '=' '(' row_descriptor ')' + { + $$ = makeRowExpr("=", $2, $6); + } ; row_descriptor: row_list ',' a_expr @@ -3320,6 +3558,76 @@ a_expr: attr opt_indirection n->subselect = $5; $$ = (Node *)n; } + | a_expr '+' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1,NIL); + n->oper = lcons("+",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '-' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1,NIL); + n->oper = lcons("-",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '/' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1,NIL); + n->oper = lcons("/",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '*' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1,NIL); + n->oper = lcons("*",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '<' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1,NIL); + n->oper = lcons("<",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '>' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1,NIL); + n->oper = lcons(">",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '=' ANY '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1,NIL); + n->oper = lcons("=",NIL); + n->useor = false; + n->subLinkType = ANY_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } | a_expr Op ALL '(' SubSelect ')' { SubLink *n = makeNode(SubLink); @@ -3330,6 +3638,76 @@ a_expr: attr opt_indirection n->subselect = $5; $$ = (Node *)n; } + | a_expr '+' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("+",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '-' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("-",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '/' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("/",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '*' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("*",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '<' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("<",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '>' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons(">",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } + | a_expr '=' ALL '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("=",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $5; + $$ = (Node *)n; + } | a_expr Op '(' SubSelect ')' { SubLink *n = makeNode(SubLink); @@ -3340,6 +3718,76 @@ a_expr: attr opt_indirection n->subselect = $4; $$ = (Node *)n; } + | a_expr '+' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("+",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $4; + $$ = (Node *)n; + } + | a_expr '-' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("-",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $4; + $$ = (Node *)n; + } + | a_expr '/' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("/",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $4; + $$ = (Node *)n; + } + | a_expr '*' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("*",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $4; + $$ = (Node *)n; + } + | a_expr '<' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("<",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $4; + $$ = (Node *)n; + } + | a_expr '>' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons(">",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $4; + $$ = (Node *)n; + } + | a_expr '=' '(' SubSelect ')' + { + SubLink *n = makeNode(SubLink); + n->lefthand = lcons($1, NULL); + n->oper = lcons("=",NIL); + n->useor = false; + n->subLinkType = ALL_SUBLINK; + n->subselect = $4; + $$ = (Node *)n; + } | a_expr AND a_expr { $$ = makeA_Expr(AND, NULL, $1, $3); } | a_expr OR a_expr |