Add keywords to implement Vadim's transaction isolation

 and lock syntax as fully parsed tokens.
Two keywords for isolation are non-reserved SQL92
 (COMMITTED, SERIALIZABLE).
All other new keywords are non-reserved Postgres (not SQL92)
 (ACCESS, EXCLUSIVE, MODE, SHARE).
Add syntax to allow CREATE [GLOBAL|LOCAL] TEMPORARY TABLE, throwing an
 error if GLOBAL is specified.

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 444b544160ee5f4b60bd7f5018d4c35ef5ecb1c3..a83f10532d95244cdd711894687a77c849902350 100644 (file)
--- 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 2.73 1999/05/11 03:28:42 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.74 1999/05/12 07:22:51 thomas Exp $
  *
  * HISTORY
  *   AUTHOR            DATE            MAJOR EVENT
@@ -136,16 +136,17 @@ Oid   param_type(int t); /* used in parse_expr.c */
        ClusterStmt, ExplainStmt, VariableSetStmt, VariableShowStmt, VariableResetStmt,
        CreateUserStmt, AlterUserStmt, DropUserStmt, RuleActionStmt
 
-%type     opt_database1, opt_database2, location, encoding
+%type         opt_database1, opt_database2, location, encoding
 
-%type     opt_lmode
+%type    opt_lock, lock_type
+%type     opt_lmode
 
 %type  user_createdb_clause, user_createuser_clause
-%type    user_passwd_clause
-%type    user_valid_clause
-%type   user_group_list, user_group_clause
+%type         user_passwd_clause
+%type         user_valid_clause
+%type    user_group_list, user_group_clause
 
-%type  TriggerActionTime, TriggerForSpec, PLangTrusted
+%type     TriggerActionTime, TriggerForSpec, PLangTrusted
 
 %type         TriggerEvents, TriggerFuncArg
 
@@ -157,6 +158,7 @@ Oid param_type(int t); /* used in parse_expr.c */
        all_Op, MathOp, opt_name, opt_unique,
        OptUseOp, opt_class, SpecialRuleRelation
 
+%type         opt_level
 %type         privileges, operation_commalist, grantee
 %type         operation, TriggerOneEvent
 
@@ -175,7 +177,7 @@ Oid param_type(int t); /* used in parse_expr.c */
 %type    func_return
 %type     set_opt
 
-%type     TriggerForOpt, TriggerForType, OptTemp
+%type     TriggerForOpt, TriggerForType, OptTemp, OptTempType, OptTempScope
 
 %type    for_update_clause, update_list
 %type     opt_union
@@ -274,13 +276,13 @@ Oid   param_type(int t); /* used in parse_expr.c */
 %token ABSOLUTE, ACTION, ADD, ALL, ALTER, AND, ANY, AS, ASC,
        BEGIN_TRANS, BETWEEN, BOTH, BY,
        CASCADE, CASE, CAST, CHAR, CHARACTER, CHECK, CLOSE,
-       COALESCE, COLLATE, COLUMN, COMMIT, 
+       COALESCE, COLLATE, COLUMN, COMMIT,
        CONSTRAINT, CREATE, CROSS, CURRENT, CURRENT_DATE, CURRENT_TIME, 
        CURRENT_TIMESTAMP, CURRENT_USER, CURSOR,
        DAY_P, DECIMAL, DECLARE, DEFAULT, DELETE, DESC, DISTINCT, DOUBLE, DROP,
        ELSE, END_TRANS, EXCEPT, EXECUTE, EXISTS, EXTRACT,
        FALSE_P, FETCH, FLOAT, FOR, FOREIGN, FROM, FULL,
-       GRANT, GROUP, HAVING, HOUR_P,
+       GLOBAL, GRANT, GROUP, HAVING, HOUR_P,
        IN, INNER_P, INSENSITIVE, INSERT, INTERSECT, INTERVAL, INTO, IS,
        ISOLATION, JOIN, KEY, LANGUAGE, LEADING, LEFT, LEVEL, LIKE, LOCAL,
        MATCH, MINUTE_P, MONTH_P, NAMES,
@@ -299,7 +301,7 @@ Oid param_type(int t); /* used in parse_expr.c */
 %token TRIGGER
 
 /* Keywords (in SQL92 non-reserved words) */
-%token TYPE_P
+%token COMMITTED, SERIALIZABLE, TYPE_P
 
 /* Keywords for Postgres support (not in SQL92 reserved words)
  *
@@ -307,17 +309,20 @@ Oid   param_type(int t); /* used in parse_expr.c */
  * when some sort of pg_privileges relation is introduced.
  * - Todd A. Brandys 1998-01-01?
  */
-%token ABORT_TRANS, AFTER, AGGREGATE, ANALYZE, BACKWARD, BEFORE, BINARY, 
+%token ABORT_TRANS, ACCESS, AFTER, AGGREGATE, ANALYZE,
+       BACKWARD, BEFORE, BINARY, 
        CACHE, CLUSTER, COPY, CREATEDB, CREATEUSER, CYCLE,
-       DATABASE, DELIMITERS, DO, EACH, ENCODING, EXPLAIN, EXTEND,
+       DATABASE, DELIMITERS, DO,
+       EACH, ENCODING, EXCLUSIVE, EXPLAIN, EXTEND,
        FORWARD, FUNCTION, HANDLER,
        INCREMENT, INDEX, INHERITS, INSTEAD, ISNULL,
        LANCOMPILER, LIMIT, LISTEN, LOAD, LOCATION, LOCK_P,
-       MAXVALUE, MINVALUE, MOVE,
+       MAXVALUE, MINVALUE, MODE, MOVE,
        NEW, NOCREATEDB, NOCREATEUSER, NONE, NOTHING, NOTIFY, NOTNULL,
        OFFSET, OIDS, OPERATOR, PASSWORD, PROCEDURAL,
        RENAME, RESET, RETURNS, ROW, RULE,
-       SEQUENCE, SERIAL, SETOF, SHOW, START, STATEMENT, STDIN, STDOUT, TRUSTED, 
+       SEQUENCE, SERIAL, SETOF, SHARE, SHOW, START, STATEMENT, STDIN, STDOUT,
+       TRUSTED, 
        UNLISTEN, UNTIL, VACUUM, VALID, VERBOSE, VERSION
 
 /* Special keywords, not in the query language - see the "lex" file */
@@ -557,22 +562,11 @@ VariableSetStmt:  SET ColId TO var_value
                    n->value = $4;
                    $$ = (Node *) n;
                }
-       | SET TRANSACTION ISOLATION LEVEL READ ColId
-               {
-                   VariableSetStmt *n = makeNode(VariableSetStmt);
-                   n->name  = "XactIsoLevel";
-                   n->value = $6;
-                   if (strcasecmp(n->value, "COMMITTED"))
-                       elog(ERROR,"parser: syntax error at or near \"%s\"", n->value);
-                   $$ = (Node *) n;
-               }
-       | SET TRANSACTION ISOLATION LEVEL ColId
+       | SET TRANSACTION ISOLATION LEVEL opt_level
                {
                    VariableSetStmt *n = makeNode(VariableSetStmt);
                    n->name  = "XactIsoLevel";
                    n->value = $5;
-                   if (strcasecmp(n->value, "SERIALIZABLE"))
-                       elog(ERROR,"parser: syntax error at or near \"%s\"", n->value);
                    $$ = (Node *) n;
                }
        | SET NAMES encoding
@@ -588,6 +582,10 @@ VariableSetStmt:  SET ColId TO var_value
                }
        ;
 
+opt_level:  READ COMMITTED                 { $$ = "committed"; }
+       | SERIALIZABLE                      { $$ = "serializable"; }
+       ;
+
 var_value:  Sconst         { $$ = $1; }
        | DEFAULT           { $$ = NULL; }
        ;
@@ -767,12 +765,26 @@ CreateStmt:  CREATE OptTemp TABLE relation_name '(' OptTableElementList ')'
                }
        ;
 
-OptTemp:
-           TEMP                            { $$ = TRUE; }
+OptTemp:  OptTempType                      { $$ = $1; }
+           | OptTempScope OptTempType      { $$ = $2; }
+       ;
+
+OptTempType:  TEMP                         { $$ = TRUE; }
            | TEMPORARY                     { $$ = TRUE; }
            | /*EMPTY*/                     { $$ = FALSE; }
        ;
 
+OptTempScope:  GLOBAL
+               {
+                   elog(ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");
+                   $$ = TRUE;
+               }
+           | LOCAL
+               {
+                    $$ = FALSE;
+               }
+       ;
+
 OptTableElementList:  OptTableElementList ',' OptTableElement
                {
                    if ($3 != NULL)
@@ -2580,78 +2592,31 @@ DeleteStmt:  DELETE FROM relation_name
                }
        ;
 
-LockStmt:  LOCK_P opt_table relation_name
+LockStmt:  LOCK_P opt_table relation_name opt_lock
                {
                    LockStmt *n = makeNode(LockStmt);
 
                    n->relname = $3;
-                   n->mode = AccessExclusiveLock;
+                   n->mode = $4;
                    $$ = (Node *)n;
                }
-       |   LOCK_P opt_table relation_name IN opt_lmode ROW IDENT IDENT
-               {
-                   LockStmt *n = makeNode(LockStmt);
-
-                   n->relname = $3;
-                   if (strcasecmp($8, "MODE"))
-                       elog(ERROR,"parser: syntax error at or near \"%s\"", $8);
-                   if ($5 != NULL)
-                   {
-                       if (strcasecmp($5, "SHARE"))
-                           elog(ERROR,"parser: syntax error at or near \"%s\"", $5);
-                       if (strcasecmp($7, "EXCLUSIVE"))
-                           elog(ERROR,"parser: syntax error at or near \"%s\"", $7);
-                       n->mode = ShareRowExclusiveLock;
-                   }
-                   else
-                   {
-                       if (strcasecmp($7, "SHARE") == 0)
-                           n->mode = RowShareLock;
-                       else if (strcasecmp($7, "EXCLUSIVE") == 0)
-                           n->mode = RowExclusiveLock;
-                       else
-                           elog(ERROR,"parser: syntax error at or near \"%s\"", $7);
-                   }
-                   $$ = (Node *)n;
-               }
-       |   LOCK_P opt_table relation_name IN IDENT IDENT IDENT
-               {
-                   LockStmt *n = makeNode(LockStmt);
+       ;
 
-                   n->relname = $3;
-                   if (strcasecmp($7, "MODE"))
-                       elog(ERROR,"parser: syntax error at or near \"%s\"", $7);
-                   if (strcasecmp($5, "ACCESS"))
-                       elog(ERROR,"parser: syntax error at or near \"%s\"", $5);
-                   if (strcasecmp($6, "SHARE") == 0)
-                       n->mode = AccessShareLock;
-                   else if (strcasecmp($6, "EXCLUSIVE") == 0)
-                       n->mode = AccessExclusiveLock;
-                   else
-                       elog(ERROR,"parser: syntax error at or near \"%s\"", $6);
-                   $$ = (Node *)n;
-               }
-       |   LOCK_P opt_table relation_name IN IDENT IDENT
-               {
-                   LockStmt *n = makeNode(LockStmt);
+opt_lock:  lock_type MODE      { $$ = $1; }
+       | /*EMPTY*/             { $$ = AccessExclusiveLock; }
+       ;
 
-                   n->relname = $3;
-                   if (strcasecmp($6, "MODE"))
-                       elog(ERROR,"parser: syntax error at or near \"%s\"", $6);
-                   if (strcasecmp($5, "SHARE") == 0)
-                       n->mode = ShareLock;
-                   else if (strcasecmp($5, "EXCLUSIVE") == 0)
-                       n->mode = ExclusiveLock;
-                   else
-                       elog(ERROR,"parser: syntax error at or near \"%s\"", $5);
-                   $$ = (Node *)n;
-               }
+lock_type:  SHARE ROW EXCLUSIVE    { $$ = ShareRowExclusiveLock; }
+       | ROW opt_lmode         { $$ = ($2? RowShareLock: RowExclusiveLock); }
+       | ACCESS opt_lmode      { $$ = ($2? AccessShareLock: AccessExclusiveLock); }
+       | opt_lmode             { $$ = ($1? ShareLock: ExclusiveLock); }
        ;
 
-opt_lmode: IDENT       { $$ = $1; }
-       | /*EMPTY*/     { $$ = NULL; }
+opt_lmode: SHARE               { $$ = TRUE; }
+       | EXCLUSIVE             { $$ = FALSE; }
        ;
 
+
 /*****************************************************************************
  *
  *     QUERY:
@@ -5173,12 +5138,14 @@ TypeId:  ColId
 ColId:  IDENT                          { $$ = $1; }
        | datetime                      { $$ = $1; }
        | ABSOLUTE                      { $$ = "absolute"; }
+       | ACCESS                        { $$ = "access"; }
        | ACTION                        { $$ = "action"; }
        | AFTER                         { $$ = "after"; }
        | AGGREGATE                     { $$ = "aggregate"; }
        | BACKWARD                      { $$ = "backward"; }
        | BEFORE                        { $$ = "before"; }
        | CACHE                         { $$ = "cache"; }
+       | COMMITTED                     { $$ = "committed"; }
        | CREATEDB                      { $$ = "createdb"; }
        | CREATEUSER                    { $$ = "createuser"; }
        | CYCLE                         { $$ = "cycle"; }
@@ -5187,6 +5154,7 @@ ColId:  IDENT                         { $$ = $1; }
        | DOUBLE                        { $$ = "double"; }
        | EACH                          { $$ = "each"; }
        | ENCODING                      { $$ = "encoding"; }
+       | EXCLUSIVE                     { $$ = "exclusive"; }
        | FORWARD                       { $$ = "forward"; }
        | FUNCTION                      { $$ = "function"; }
        | HANDLER                       { $$ = "handler"; }
@@ -5203,6 +5171,7 @@ ColId:  IDENT                         { $$ = $1; }
        | MATCH                         { $$ = "match"; }
        | MAXVALUE                      { $$ = "maxvalue"; }
        | MINVALUE                      { $$ = "minvalue"; }
+       | MODE                          { $$ = "mode"; }
        | NEXT                          { $$ = "next"; }
        | NOCREATEDB                    { $$ = "nocreatedb"; }
        | NOCREATEUSER                  { $$ = "nocreateuser"; }
@@ -5226,6 +5195,8 @@ ColId:  IDENT                         { $$ = $1; }
        | SCROLL                        { $$ = "scroll"; }
        | SEQUENCE                      { $$ = "sequence"; }
        | SERIAL                        { $$ = "serial"; }
+       | SERIALIZABLE                  { $$ = "serializable"; }
+       | SHARE                         { $$ = "share"; }
        | START                         { $$ = "start"; }
        | STATEMENT                     { $$ = "statement"; }
        | STDIN                         { $$ = "stdin"; }
@@ -5269,9 +5240,11 @@ ColLabel:  ColId                     { $$ = $1; }
        | EXTEND                        { $$ = "extend"; }
        | FALSE_P                       { $$ = "false"; }
        | FOREIGN                       { $$ = "foreign"; }
+       | GLOBAL                        { $$ = "global"; }
        | GROUP                         { $$ = "group"; }
        | LISTEN                        { $$ = "listen"; }
        | LOAD                          { $$ = "load"; }
+       | LOCAL                         { $$ = "local"; }
        | LOCK_P                        { $$ = "lock"; }
        | MOVE                          { $$ = "move"; }
        | NEW                           { $$ = "new"; }

diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c
index 3cce6647dca7ba75f6940a1aa1fc48d3055dea39..40df1f40c418e480d52bb877ae53e542b72fd779 100644 (file)
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.56 1999/04/19 16:00:18 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.57 1999/05/12 07:22:52 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,6 +31,7 @@ static ScanKeyword ScanKeywords[] = {
    /* name, value */
    {"abort", ABORT_TRANS},
    {"absolute", ABSOLUTE},
+   {"access", ACCESS},
    {"action", ACTION},
    {"add", ADD},
    {"after", AFTER},
@@ -62,6 +63,7 @@ static ScanKeyword ScanKeywords[] = {
    {"collate", COLLATE},
    {"column", COLUMN},
    {"commit", COMMIT},
+   {"committed", COMMITTED},
    {"constraint", CONSTRAINT},
    {"copy", COPY},
    {"create", CREATE},
@@ -92,7 +94,7 @@ static ScanKeyword ScanKeywords[] = {
    {"end", END_TRANS},
    /***S*I***/
    {"except", EXCEPT},
-
+   {"exclusive", EXCLUSIVE},
    {"execute", EXECUTE},
    {"exists", EXISTS},
    {"explain", EXPLAIN},
@@ -107,6 +109,7 @@ static ScanKeyword ScanKeywords[] = {
    {"from", FROM},
    {"full", FULL},
    {"function", FUNCTION},
+   {"global", GLOBAL},
    {"grant", GRANT},
    {"group", GROUP},
    {"handler", HANDLER},
@@ -122,7 +125,6 @@ static ScanKeyword ScanKeywords[] = {
    {"instead", INSTEAD},
    /***S*I***/
    {"intersect", INTERSECT},
-
    {"interval", INTERVAL},
    {"into", INTO},
    {"is", IS},
@@ -146,6 +148,7 @@ static ScanKeyword ScanKeywords[] = {
    {"maxvalue", MAXVALUE},
    {"minute", MINUTE_P},
    {"minvalue", MINVALUE},
+   {"mode", MODE},
    {"month", MONTH_P},
    {"move", MOVE},
    {"names", NAMES},
@@ -202,8 +205,10 @@ static ScanKeyword ScanKeywords[] = {
    {"select", SELECT},
    {"sequence", SEQUENCE},
    {"serial", SERIAL},
+   {"serializable", SERIALIZABLE},
    {"set", SET},
    {"setof", SETOF},
+   {"share", SHARE},
    {"show", SHOW},
    {"start", START},
    {"statement", STATEMENT},