Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit943eae9

Browse files
committed
Add ALSO keyword to CREATE RULE.
Fabien COELHO
1 parent53cd7cd commit943eae9

File tree

6 files changed

+29
-21
lines changed

6 files changed

+29
-21
lines changed

‎doc/src/sgml/keywords.sgml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/keywords.sgml,v 2.12 2003/11/29 19:51:37 pgsql Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/keywords.sgml,v 2.13 2004/03/09 05:05:40 momjian Exp $ -->
22

33
<appendix id="sql-keywords-appendix">
44
<title><acronym>SQL</acronym> Key Words</title>
@@ -170,6 +170,12 @@
170170
<entry>reserved</entry>
171171
<entry>reserved</entry>
172172
</row>
173+
<row>
174+
<entry><token>ALSO</token></entry>
175+
<entry>non-reserved</entry>
176+
<entry></entry>
177+
<entry></entry>
178+
</row>
173179
<row>
174180
<entry><token>ALTER</token></entry>
175181
<entry>non-reserved</entry>

‎doc/src/sgml/rules.sgml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.33 2003/12/13 23:59:06 neilc Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.34 2004/03/09 05:05:40 momjian Exp $ -->
22

33
<Chapter Id="rules">
44
<Title>The Rule System</Title>
@@ -873,7 +873,7 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
873873

874874
<ListItem>
875875
<Para>
876-
They can be <literal>INSTEAD</> ornot.
876+
They can be <literal>INSTEAD</> or<literal>ALSO</> (default).
877877
</Para>
878878
</ListItem>
879879

@@ -904,7 +904,7 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
904904
<ProgramListing>
905905
CREATE RULE <replaceable>rule_name</> AS ON <replaceable>event</>
906906
TO <replaceable>object</> [WHERE <replaceable>rule_qualification</>]
907-
DO [INSTEAD] [<replaceable>action</> | (<replaceable>actions</>) | NOTHING];
907+
DO [ALSO|INSTEAD] [<replaceable>action</> | (<replaceable>actions</>) | NOTHING];
908908
</ProgramListing>
909909

910910
in mind.
@@ -920,7 +920,7 @@ CREATE RULE <replaceable>rule_name</> AS ON <replaceable>event</>
920920
Initially the query-tree list is empty.
921921
There can be zero (<literal>NOTHING</> key word), one, or multiple actions.
922922
To simplify, we will look at a rule with one action. This rule
923-
can have a qualification or not and it can be <literal>INSTEAD</> ornot.
923+
can have a qualification or not and it can be <literal>INSTEAD</> or<literal>ALSO</> (default).
924924
</Para>
925925

926926
<Para>
@@ -937,7 +937,7 @@ CREATE RULE <replaceable>rule_name</> AS ON <replaceable>event</>
937937

938938
<variablelist>
939939
<varlistentry>
940-
<term>No qualification andnot<literal>INSTEAD</></term>
940+
<term>No qualification and <literal>ALSO</></term>
941941
<listitem>
942942
<para>
943943
the query tree from the rule action with the original query
@@ -957,7 +957,7 @@ CREATE RULE <replaceable>rule_name</> AS ON <replaceable>event</>
957957
</varlistentry>
958958

959959
<varlistentry>
960-
<term>Qualification given andnot<literal>INSTEAD</></term>
960+
<term>Qualification given and <literal>ALSO</></term>
961961
<listitem>
962962
<para>
963963
the query tree from the rule action with the rule
@@ -980,7 +980,7 @@ CREATE RULE <replaceable>rule_name</> AS ON <replaceable>event</>
980980
</varlistentry>
981981
</variablelist>
982982

983-
Finally, if the rule isnot<literal>INSTEAD</>, the unchanged original query tree is
983+
Finally, if the rule is <literal>ALSO</>, the unchanged original query tree is
984984
added to the list. Since only qualified <literal>INSTEAD</> rules already add the
985985
original query tree, we end up with either one or two output query trees
986986
for a rule with one action.
@@ -1111,7 +1111,7 @@ INSERT INTO shoelace_log VALUES (
11111111
</Para>
11121112

11131113
<Para>
1114-
The rule is a qualifiednon-<literal>INSTEAD</> rule, so the rule system
1114+
The rule is a qualified <literal>ALSO</> rule, so the rule system
11151115
has to return two query trees: the modified rule action and the original
11161116
query tree. In step 1, the range table of the original query is
11171117
incorporated into the rule's action query tree. This results in:
@@ -1190,7 +1190,7 @@ INSERT INTO shoelace_log VALUES (
11901190
</para>
11911191

11921192
<para>
1193-
That's it. Since the rule isnot<literal>INSTEAD</>, we also output the
1193+
That's it. Since the rule is <literal>ALSO</>, we also output the
11941194
original query tree. In short, the output from the rule system
11951195
is a list of two query trees that correspond to these statements:
11961196

‎src/backend/parser/gram.y‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.446 2004/01/11 04:58:17 neilc Exp $
14+
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.447 2004/03/09 05:05:41 momjian Exp $
1515
*
1616
* HISTORY
1717
* AUTHORDATEMAJOR EVENT
@@ -332,7 +332,7 @@ static void doNegateFloat(Value *v);
332332

333333
/* ordinary key words in alphabetical order*/
334334
%token<keyword>ABORT_PABSOLUTE_PACCESSACTIONADDAFTER
335-
AGGREGATE ALL ALTER ANALYSE ANALYZE AND ANY ARRAY AS ASC
335+
AGGREGATE ALLALSOALTER ANALYSE ANALYZE AND ANY ARRAY AS ASC
336336
ASSERTION ASSIGNMENT AT AUTHORIZATION
337337

338338
BACKWARD BEFORE BEGIN_P BETWEEN BIGINT BINARY BIT
@@ -3610,6 +3610,7 @@ event:SELECT{ $$ = CMD_SELECT; }
36103610

36113611
opt_instead:
36123612
INSTEAD{$$ =TRUE; }
3613+
| ALSO{$$ =FALSE; }
36133614
|/*EMPTY*/{$$ =FALSE; }
36143615
;
36153616

‎src/backend/parser/keywords.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.145 2004/02/21 00:34:52 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.146 2004/03/09 05:05:41 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -38,6 +38,7 @@ static const ScanKeyword ScanKeywords[] = {
3838
{"after",AFTER},
3939
{"aggregate",AGGREGATE},
4040
{"all",ALL},
41+
{"also",ALSO},
4142
{"alter",ALTER},
4243
{"analyse",ANALYSE},/* British spelling */
4344
{"analyze",ANALYZE},

‎src/test/regress/expected/rules.out‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ create table rtest_system (sysname text, sysdesc text);
3434
create table rtest_interface (sysname text, ifname text);
3535
create table rtest_person (pname text, pdesc text);
3636
create table rtest_admin (pname text, sysname text);
37-
create rule rtest_sys_upd as on update to rtest_system do (
37+
create rule rtest_sys_upd as on update to rtest_system doalso(
3838
update rtest_interface set sysname = new.sysname
3939
where sysname = old.sysname;
4040
update rtest_admin set sysname = new.sysname
4141
where sysname = old.sysname
4242
);
43-
create rule rtest_sys_del as on delete to rtest_system do (
43+
create rule rtest_sys_del as on delete to rtest_system doalso(
4444
delete from rtest_interface where sysname = old.sysname;
4545
delete from rtest_admin where sysname = old.sysname;
4646
);
47-
create rule rtest_pers_upd as on update to rtest_person do
47+
create rule rtest_pers_upd as on update to rtest_person doalso
4848
update rtest_admin set pname = new.pname where pname = old.pname;
49-
create rule rtest_pers_del as on delete to rtest_person do
49+
create rule rtest_pers_del as on delete to rtest_person doalso
5050
delete from rtest_admin where pname = old.pname;
5151
--
5252
-- Tables and rules for the logging test

‎src/test/regress/sql/rules.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@ create table rtest_interface (sysname text, ifname text);
3636
createtablertest_person (pnametext, pdesctext);
3737
createtablertest_admin (pnametext, sysnametext);
3838

39-
createrulertest_sys_updasonupdate to rtest_system do (
39+
createrulertest_sys_updasonupdate to rtest_system doalso(
4040
update rtest_interfaceset sysname=new.sysname
4141
where sysname=old.sysname;
4242
update rtest_adminset sysname=new.sysname
4343
where sysname=old.sysname
4444
);
4545

46-
createrulertest_sys_delason delete to rtest_system do (
46+
createrulertest_sys_delason delete to rtest_system doalso(
4747
deletefrom rtest_interfacewhere sysname=old.sysname;
4848
deletefrom rtest_adminwhere sysname=old.sysname;
4949
);
5050

51-
createrulertest_pers_updasonupdate to rtest_person do
51+
createrulertest_pers_updasonupdate to rtest_person doalso
5252
update rtest_adminset pname=new.pnamewhere pname=old.pname;
5353

54-
createrulertest_pers_delason delete to rtest_person do
54+
createrulertest_pers_delason delete to rtest_person doalso
5555
deletefrom rtest_adminwhere pname=old.pname;
5656

5757
--

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp