diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-03-10 06:00:15 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-03-10 06:00:15 +0000 |
| commit | ee27436f6cbedf69b2da7c6fc69548232b476833 (patch) | |
| tree | ab996a5cfe900248a678d4274ec008c06de2fad8 | |
| parent | f20509551dd1ddccd84beb2bc582fa26ed431432 (diff) | |
| download | postgresql-ee27436f6cbedf69b2da7c6fc69548232b476833.tar.gz postgresql-ee27436f6cbedf69b2da7c6fc69548232b476833.zip | |
Disable brackets in multi-statement rules, as discussed.
| -rw-r--r-- | doc/src/sgml/ref/create_rule.sgml | 22 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 3 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/preproc.y | 1 |
3 files changed, 11 insertions, 15 deletions
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml index 6a03cfbd661..ab1a8eeba15 100644 --- 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 index f9a876f1495..978be8b58ea 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.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 index 03b36aacb96..b5877f5ef9a 100644 --- 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(")")); } ; |