diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-11-09 23:56:39 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-11-09 23:56:39 +0000 |
| commit | ebb531836ada81958bbf95c60dd05dc58eb3e810 (patch) | |
| tree | f15c094f02bf8b9b5493e35defbd8ee2d1a3be2c /src/backend/parser | |
| parent | f2ef470196530e862b01c95e3b599e29102c887e (diff) | |
| download | postgresql-ebb531836ada81958bbf95c60dd05dc58eb3e810.tar.gz postgresql-ebb531836ada81958bbf95c60dd05dc58eb3e810.zip | |
Add code to handle [ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP }]
for temp tables.
Gavin Sherry
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/gram.y | 24 | ||||
| -rw-r--r-- | src/backend/parser/keywords.c | 4 |
2 files changed, 22 insertions, 6 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index e1a179c7c13..5fe83ac41db 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.373 2002/11/02 18:41:21 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.374 2002/11/09 23:56:39 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -54,6 +54,7 @@ #include "catalog/index.h" #include "catalog/namespace.h" #include "catalog/pg_type.h" +#include "commands/tablecmds.h" #include "nodes/makefuncs.h" #include "nodes/params.h" #include "nodes/parsenodes.h" @@ -224,6 +225,7 @@ static void doNegateFloat(Value *v); %type <typnam> func_arg func_return func_type aggr_argtype %type <boolean> opt_arg TriggerForType OptTemp OptWithOids +%type <chr> OptEOXact %type <list> for_update_clause opt_for_update_clause update_list %type <boolean> opt_all @@ -370,10 +372,11 @@ static void doNegateFloat(Value *v); ORDER OUT_P OUTER_P OVERLAPS OVERLAY OWNER PARTIAL PASSWORD PATH_P PENDANT PLACING POSITION - PRECISION PREPARE PRIMARY PRIOR PRIVILEGES PROCEDURAL PROCEDURE + PRECISION PRESERVE PREPARE PRIMARY PRIOR PRIVILEGES PROCEDURAL + PROCEDURE READ REAL RECHECK REFERENCES REINDEX RELATIVE RENAME REPLACE - RESET RESTRICT RETURNS REVOKE RIGHT ROLLBACK ROW + RESET RESTRICT RETURNS REVOKE RIGHT ROLLBACK ROW ROWS RULE SCHEMA SCROLL SECOND_P SECURITY SELECT SEQUENCE @@ -1372,15 +1375,20 @@ opt_using: *****************************************************************************/ CreateStmt: CREATE OptTemp TABLE qualified_name '(' OptTableElementList ')' - OptInherit OptWithOids + OptInherit OptWithOids OptEOXact { CreateStmt *n = makeNode(CreateStmt); + + if($2 == FALSE && $10 != ATEOXACTNOOP) + elog(ERROR,"ON COMMIT can only be used on TEMP tables"); + $4->istemp = $2; n->relation = $4; n->tableElts = $6; n->inhRelations = $8; n->constraints = NIL; n->hasoids = $9; + n->ateoxact = $10; $$ = (Node *)n; } | CREATE OptTemp TABLE qualified_name OF qualified_name @@ -1799,7 +1807,11 @@ OptWithOids: | /*EMPTY*/ { $$ = TRUE; } ; - +OptEOXact: ON COMMIT DROP { $$ = ATEOXACTDROP; } + | ON COMMIT DELETE_P ROWS { $$ = ATEOXACTDELETE; } + | ON COMMIT PRESERVE ROWS { $$ = ATEOXACTPRESERVE; } + | /*EMPTY*/ { $$ = ATEOXACTNOOP; } + ; /* * Note: CREATE TABLE ... AS SELECT ... is just another spelling for * SELECT ... INTO. @@ -7074,6 +7086,7 @@ unreserved_keyword: | PENDANT | PRECISION | PREPARE + | PRESERVE | PRIOR | PRIVILEGES | PROCEDURAL @@ -7089,6 +7102,7 @@ unreserved_keyword: | RETURNS | REVOKE | ROLLBACK + | ROWS | RULE | SCHEMA | SCROLL diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c index 305ed860181..6c15cc50801 100644 --- a/src/backend/parser/keywords.c +++ b/src/backend/parser/keywords.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.127 2002/09/18 21:35:22 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.128 2002/11/09 23:56:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -232,6 +232,7 @@ static const ScanKeyword ScanKeywords[] = { {"position", POSITION}, {"precision", PRECISION}, {"prepare", PREPARE}, + {"preserve", PRESERVE}, {"primary", PRIMARY}, {"prior", PRIOR}, {"privileges", PRIVILEGES}, @@ -252,6 +253,7 @@ static const ScanKeyword ScanKeywords[] = { {"right", RIGHT}, {"rollback", ROLLBACK}, {"row", ROW}, + {"rows",ROWS}, {"rule", RULE}, {"schema", SCHEMA}, {"scroll", SCROLL}, |