Disable brackets in multi-statement rules, as discussed.

bmomjian · bmomjian · commit ee27436f6cbe · 2002-03-10T06:00:15.000Z
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.31 2002/01/24 18:28:15 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.32 2002/03/10 06:00:13 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -32,8 +32,6 @@ NOTHING
 <replaceable class="parameter">query</replaceable>
 |
 ( <replaceable class="parameter">query</replaceable> ; <replaceable class="parameter">query</replaceable> ... )
-|
-[ <replaceable class="parameter">query</replaceable> ; <replaceable class="parameter">query</replaceable> ... ]
   </synopsis>
 
   <refsect2 id="R2-SQL-CREATERULE-1">
@@ -177,15 +175,15 @@ CREATE
   </para>
 
   <para>
-   The <replaceable class="parameter">action</replaceable> part of the rule
-   can consist of one or more queries.  To write multiple queries, surround
-   them with either parentheses or square brackets.  Such queries will be
-   performed in the specified order (whereas there are no guarantees about
-   the execution order of multiple rules for an object).  The
-   <replaceable class="parameter">action</replaceable> can also be NOTHING
-   indicating no action.  Thus, a DO INSTEAD NOTHING rule suppresses the
-   original query from executing (when its condition is true); a DO NOTHING
-   rule is useless.
+   The <replaceable class="parameter">action</replaceable> part of the
+   rule can consist of one or more queries. To write multiple queries,
+   surround them with parentheses. Such queries will be performed in the
+   specified order (whereas there are no guarantees about the execution
+   order of multiple rules for an object). The <replaceable
+   class="parameter">action</replaceable> can also be NOTHING indicating
+   no action. Thus, a DO INSTEAD NOTHING rule suppresses the original
+   query from executing (when its condition is true); a DO NOTHING rule
+   is useless.
   </para>
 
   <para>
diff --git 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.289 2002/03/09 17:37:16 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.290 2002/03/10 06:00:13 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -2841,7 +2841,6 @@ RuleStmt:  CREATE RULE name AS
 
 RuleActionList:  NOTHING				{ $$ = NIL; }
 		| RuleActionStmt				{ $$ = makeList1($1); }
-		| '[' RuleActionMulti ']'		{ $$ = $2; }
 		| '(' RuleActionMulti ')'		{ $$ = $2; } 
 		;
 
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -2153,7 +2153,6 @@ RuleStmt:  CREATE RULE name AS
 
 RuleActionList:  NOTHING                               { $$ = make_str("nothing"); }
                | RuleActionStmt                        { $$ = $1; }
-               | '[' RuleActionMulti ']'               { $$ = cat_str(3, make_str("["), $2, make_str("]")); }
                | '(' RuleActionMulti ')'               { $$ = cat_str(3, make_str("("), $2, make_str(")")); }
                 ;
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.289 2002/03/09 17:37:16 thomas Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.290 2002/03/10 06:00:13 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -2841,7 +2841,6 @@ RuleStmt: CREATE RULE name AS`
`2841`	`2841`
`2842`	`2842`	`RuleActionList: NOTHING { $$ = NIL; }`
`2843`	`2843`	`\| RuleActionStmt { $$ = makeList1($1); }`
`2844`		`- \| '[' RuleActionMulti ']' { $$ = $2; }`
`2845`	`2844`	`\| '(' RuleActionMulti ')' { $$ = $2; }`
`2846`	`2845`	`;`
`2847`	`2846`
Original file line number	Diff line number	Diff line change
`@@ -2153,7 +2153,6 @@ RuleStmt: CREATE RULE name AS`
`2153`	`2153`
`2154`	`2154`	`RuleActionList: NOTHING { $$ = make_str("nothing"); }`
`2155`	`2155`	`\| RuleActionStmt { $$ = $1; }`
`2156`		`- \| '[' RuleActionMulti ']' { $$ = cat_str(3, make_str("["), $2, make_str("]")); }`
`2157`	`2156`	`\| '(' RuleActionMulti ')' { $$ = cat_str(3, make_str("("), $2, make_str(")")); }`
`2158`	`2157`	`;`
`2159`	`2158`