1010 *
1111 *
1212 * IDENTIFICATION
13- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.88 1999/07/09 21:59:59 momjian Exp $
13+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.89 1999/07/13 21:17:33 momjian Exp $
1414 *
1515 * HISTORY
1616 * AUTHORDATEMAJOR EVENT
@@ -2465,7 +2465,6 @@ OptimizableStmt: SelectStmt
24652465 *
24662466 *****************************************************************************/
24672467
2468- /***S*I***/
24692468/* This rule used 'opt_column_list' between 'relation_name' and 'insert_rest'
24702469 * originally. When the second rule of 'insert_rest' was changed to use
24712470 * the new 'SelectStmt' rule (for INTERSECT and EXCEPT) it produced a shift/reduce
@@ -2500,10 +2499,8 @@ insert_rest: VALUES '(' res_target_list2 ')'
25002499$$->groupClause = NIL;
25012500$$->havingClause = NULL;
25022501$$->unionClause = NIL;
2503- /***S*I***/
25042502 $$->intersectClause = NIL;
25052503}
2506- /***S*I***/
25072504/* We want the full power of SelectStatements including INTERSECT and EXCEPT
25082505 * for insertion */
25092506| SelectStmt
@@ -2534,7 +2531,6 @@ insert_rest: VALUES '(' res_target_list2 ')'
25342531$$->groupClause = NIL;
25352532$$->havingClause = NULL;
25362533$$->unionClause = NIL;
2537- /***S*I***/
25382534 $$->intersectClause = NIL;
25392535}
25402536| '(' columnList ')' SelectStmt
@@ -2646,7 +2642,6 @@ UpdateStmt: UPDATE relation_name
26462642 *CURSOR STATEMENTS
26472643 *
26482644 *****************************************************************************/
2649- /***S*I***/
26502645CursorStmt: DECLARE name opt_cursor CURSOR FOR SelectStmt
26512646 {
26522647 SelectStmt *n;
@@ -2685,7 +2680,6 @@ opt_cursor: BINARY{ $$ = TRUE; }
26852680 *SELECT STATEMENTS
26862681 *
26872682 *****************************************************************************/
2688- /***S*I***/
26892683/* The new 'SelectStmt' rule adapted for the optional use of INTERSECT EXCEPT and UNION
26902684 * accepts the use of '(' and ')' to select an order of set operations.
26912685 *
@@ -2770,7 +2764,6 @@ SelectStmt: select_clause sort_clause for_update_clause opt_select_limit
27702764}
27712765;
27722766
2773- /***S*I***/
27742767/* This rule parses Select statements including UNION INTERSECT and EXCEPT.
27752768 * '(' and ')' can be used to specify the order of the operations
27762769 * (UNION EXCEPT INTERSECT). Without the use of '(' and ')' we want the
@@ -2812,7 +2805,6 @@ select_clause: '(' select_clause ')'
28122805}
28132806;
28142807
2815- /***S*I***/
28162808SubSelect:SELECT opt_unique res_target_list2
28172809 result from_clause where_clause
28182810 group_clause having_clause
@@ -2821,7 +2813,6 @@ SubSelect:SELECT opt_unique res_target_list2
28212813n->unique = $2;
28222814n->unionall = FALSE;
28232815n->targetList = $3;
2824- /***S*I***/
28252816/* This is new: Subselects support the INTO clause
28262817 * which allows queries that are not part of the
28272818 * SQL92 standard and should not be formulated!