diff options
Diffstat (limited to 'src/interfaces/ecpg')
| -rw-r--r-- | src/interfaces/ecpg/preproc/keywords.c | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/preproc.y | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c index 5306860ae3..64fb7bc982 100644 --- a/src/interfaces/ecpg/preproc/keywords.c +++ b/src/interfaces/ecpg/preproc/keywords.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.13 1999/04/26 05:28:47 meskes Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.14 1999/07/13 21:17:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -91,7 +91,6 @@ static ScanKeyword ScanKeywords[] = { {"else", ELSE}, {"encoding", ENCODING}, {"end", END_TRANS}, - /***S*I***/ {"except", EXCEPT}, {"execute", EXECUTE}, @@ -121,7 +120,6 @@ static ScanKeyword ScanKeywords[] = { {"insensitive", INSENSITIVE}, {"insert", INSERT}, {"instead", INSTEAD}, - /***S*I***/ {"intersect", INTERSECT}, {"interval", INTERVAL}, diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 274d4b64a0..7f244c7685 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -2622,7 +2622,6 @@ OptimizableStmt: SelectStmt * *****************************************************************************/ -/***S*I***/ /* This rule used 'opt_column_list' between 'relation_name' and 'insert_rest' * originally. When the second rule of 'insert_rest' was changed to use * the new 'SelectStmt' rule (for INTERSECT and EXCEPT) it produced a shift/red uce @@ -2778,7 +2777,6 @@ opt_cursor: BINARY { $$ = make1_str("binary"); } * *****************************************************************************/ -/***S*I***/ /* The new 'SelectStmt' rule adapted for the optional use of INTERSECT EXCEPT a nd UNION * accepts the use of '(' and ')' to select an order of set operations. * The rule returns a SelectStmt Node having the set operations attached to @@ -2794,7 +2792,6 @@ SelectStmt: select_clause sort_clause for_update_clause opt_select_limit $$ = cat4_str($1, $2, $3, $4); } -/***S*I***/ /* This rule parses Select statements including UNION INTERSECT and EXCEPT. * '(' and ')' can be used to specify the order of the operations * (UNION EXCEPT INTERSECT). Without the use of '(' and ')' we want the @@ -2827,7 +2824,6 @@ select_clause: '(' select_clause ')' } ; -/***S*I***/ SubSelect: SELECT opt_unique res_target_list2 result from_clause where_clause group_clause having_clause |