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

Commitb312080

Browse files
committed
Rule names are now unique per-relation, rather than unique globally.
DROP RULE and COMMENT ON RULE syntax adds an 'ON tablename' clause,similar to TRIGGER syntaxes. To allow loading of existing pg_dumpfiles containing COMMENT ON RULE, the COMMENT code will still acceptthe old syntax --- but only if the target rulename is unique acrossthe whole database.
1 parent4e08a62 commitb312080

35 files changed

+490
-301
lines changed

‎doc/src/sgml/func.sgml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.94 2002/03/22 19:20:09 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.95 2002/04/1820:01:08 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -4344,7 +4344,12 @@ SELECT NULLIF(value, '(none)') ...
43444344
<entry>Get CREATE VIEW command for view</>
43454345
</row>
43464346
<row>
4347-
<entry><function>pg_get_ruledef</>(<parameter>rulename</parameter>)</entry>
4347+
<entry><function>pg_get_viewdef</>(<parameter>viewOID</parameter>)</entry>
4348+
<entry><type>text</></entry>
4349+
<entry>Get CREATE VIEW command for view</>
4350+
</row>
4351+
<row>
4352+
<entry><function>pg_get_ruledef</>(<parameter>ruleOID</parameter>)</entry>
43484353
<entry><type>text</></entry>
43494354
<entry>Get CREATE RULE command for rule</>
43504355
</row>

‎doc/src/sgml/ref/comment.sgml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/comment.sgml,v 1.15 2002/03/19 02:18:12 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/comment.sgml,v 1.16 2002/04/18 20:01:09 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -25,11 +25,12 @@ PostgreSQL documentation
2525
<synopsis>
2626
COMMENT ON
2727
[
28-
[ DATABASE | DOMAIN | INDEX |RULE |SEQUENCE | TABLE | TYPE | VIEW ] <replaceable class="PARAMETER">object_name</replaceable> |
28+
[ DATABASE | DOMAIN | INDEX | SEQUENCE | TABLE | TYPE | VIEW ] <replaceable class="PARAMETER">object_name</replaceable> |
2929
COLUMN <replaceable class="PARAMETER">table_name</replaceable>.<replaceable class="PARAMETER">column_name</replaceable> |
3030
AGGREGATE <replaceable class="PARAMETER">agg_name</replaceable> (<replaceable class="PARAMETER">agg_type</replaceable>) |
3131
FUNCTION <replaceable class="PARAMETER">func_name</replaceable> (<replaceable class="PARAMETER">arg1</replaceable>, <replaceable class="PARAMETER">arg2</replaceable>, ...) |
3232
OPERATOR <replaceable class="PARAMETER">op</replaceable> (<replaceable class="PARAMETER">leftoperand_type</replaceable> <replaceable class="PARAMETER">rightoperand_type</replaceable>) |
33+
RULE <replaceable class="PARAMETER">rule_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
3334
TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable>
3435
] IS <replaceable class="PARAMETER">'text'</replaceable>
3536
</synopsis>
@@ -46,7 +47,7 @@ COMMENT ON
4647
<variablelist>
4748
<varlistentry>
4849
<term><replaceable class="PARAMETER">object_name, table_name,
49-
column_name, agg_name, func_name, op, trigger_name</replaceable></term>
50+
column_name, agg_name, func_name, op,rule_name,trigger_name</replaceable></term>
5051
<listitem>
5152
<para>
5253
The name of the object to be be commented.
@@ -143,7 +144,6 @@ COMMENT ON mytable IS 'This is my table.';
143144
COMMENT ON DATABASE my_database IS 'Development Database';
144145
COMMENT ON DOMAIN my_domain IS 'Email Address Domain';
145146
COMMENT ON INDEX my_index IS 'Enforces uniqueness on employee id';
146-
COMMENT ON RULE my_rule IS 'Logs UPDATES of employee records';
147147
COMMENT ON SEQUENCE my_sequence IS 'Used to generate primary keys';
148148
COMMENT ON TABLE my_table IS 'Employee Information';
149149
COMMENT ON TYPE my_type IS 'Complex Number support';
@@ -152,6 +152,7 @@ COMMENT ON COLUMN my_table.my_field IS 'Employee ID number';
152152
COMMENT ON AGGREGATE my_aggregate (double precision) IS 'Computes sample variance';
153153
COMMENT ON FUNCTION my_function (timestamp) IS 'Returns Roman Numeral';
154154
COMMENT ON OPERATOR ^ (text, text) IS 'Performs intersection of two text';
155+
COMMENT ON RULE my_rule ON my_table IS 'Logs UPDATES of employee records';
155156
COMMENT ON TRIGGER my_trigger ON my_table IS 'Used for R.I.';
156157
</programlisting>
157158
</para>

‎doc/src/sgml/ref/drop_rule.sgml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.11 2001/12/08 03:24:36 thomas Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.12 2002/04/18 20:01:09 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<date>1998-09-22</date>
2424
</refsynopsisdivinfo>
2525
<synopsis>
26-
DROP RULE <replaceable class="PARAMETER">name</replaceable>[, ...]
26+
DROP RULE <replaceable class="PARAMETER">name</replaceable>ON <replaceable class="PARAMETER">relation</replaceable>
2727
</synopsis>
2828

2929
<refsect2 id="R2-SQL-DROPRULE-1">
@@ -43,6 +43,14 @@ DROP RULE <replaceable class="PARAMETER">name</replaceable> [, ...]
4343
</para>
4444
</listitem>
4545
</varlistentry>
46+
<varlistentry>
47+
<term><replaceable class="parameter">relation</replaceable></term>
48+
<listitem>
49+
<para>
50+
The name of the relation the rule applies to.
51+
</para>
52+
</listitem>
53+
</varlistentry>
4654
</variablelist>
4755
</para>
4856
</refsect2>
@@ -68,7 +76,7 @@ DROP
6876
</varlistentry>
6977
<varlistentry>
7078
<term><computeroutput>
71-
ERROR: Ruleor view"<replaceable class="parameter">name</replaceable>" not found
79+
ERROR: Rule "<replaceable class="parameter">name</replaceable>" not found
7280
</computeroutput></term>
7381
<listitem>
7482
<para>
@@ -113,11 +121,6 @@ ERROR: Rule or view "<replaceable class="parameter">name</replaceable>" not fou
113121
Refer to <command>CREATE RULE</command> for
114122
information on how to create rules.
115123
</para>
116-
117-
<para>
118-
Once a rule is dropped, access to historical information
119-
the rule has written may disappear.
120-
</para>
121124
</refsect2>
122125
</refsect1>
123126

@@ -129,7 +132,7 @@ ERROR: Rule or view "<replaceable class="parameter">name</replaceable>" not fou
129132
To drop the rewrite rule <literal>newrule</literal>:
130133

131134
<programlisting>
132-
DROP RULE newrule;
135+
DROP RULE newrule ON mytable;
133136
</programlisting>
134137
</para>
135138
</refsect1>

‎doc/src/sgml/release.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.132 2002/04/10 22:46:48 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.133 2002/04/18 20:01:08 tgl Exp $
33
-->
44

55
<appendix id="release">
@@ -24,6 +24,7 @@ CDATA means the content is "SGML-free", so you can write without
2424
worries about funny characters.
2525
-->
2626
<literallayout><![CDATA[
27+
Rule names are now per-relation, not global; DROP RULE and COMMENT ON RULE syntax changes accordingly
2728
Readline and Zlib are now required by default and must be turned off explicitly if their use is not desired
2829
Define a third class of function volatility to allow indexscans in more cases
2930
Locale support is now built by default; choice of locale is set by initdb and/or at run-time

‎src/backend/catalog/indexing.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.90 2002/04/17 20:57:56 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.91 2002/04/18 20:01:09 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -68,7 +68,7 @@ char *Name_pg_proc_indices[Num_pg_proc_indices] =
6868
char*Name_pg_relcheck_indices[Num_pg_relcheck_indices]=
6969
{RelCheckIndex};
7070
char*Name_pg_rewrite_indices[Num_pg_rewrite_indices]=
71-
{RewriteOidIndex,RewriteRulenameIndex};
71+
{RewriteOidIndex,RewriteRelRulenameIndex};
7272
char*Name_pg_shadow_indices[Num_pg_shadow_indices]=
7373
{ShadowNameIndex,ShadowSysidIndex};
7474
char*Name_pg_statistic_indices[Num_pg_statistic_indices]=

‎src/backend/commands/comment.c

Lines changed: 81 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1999-2001, PostgreSQL Global Development Group
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/comment.c,v 1.41 2002/04/16 23:08:10 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/comment.c,v 1.42 2002/04/18 20:01:09 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -472,44 +472,105 @@ CommentDatabase(List *qualname, char *comment)
472472
* CommentRule --
473473
*
474474
* This routine is used to add/drop any user-comments a user might
475-
* have regarding a specified RULE. The rule is specified by name
476-
* and, if found, and the user has appropriate permissions, a
477-
* comment will be added/dropped using the CreateComments() routine.
475+
* have regarding a specified RULE. The rule for commenting is determined by
476+
* both its name and the relation to which it refers. The arguments to this
477+
* function are the rule name and relation name (merged into a qualified
478+
* name), and the comment to add/drop.
479+
*
480+
* Before PG 7.3, rules had unique names across the whole database, and so
481+
* the syntax was just COMMENT ON RULE rulename, with no relation name.
482+
* For purposes of backwards compatibility, we support that as long as there
483+
* is only one rule by the specified name in the database.
478484
*/
479485
staticvoid
480486
CommentRule(List*qualname,char*comment)
481487
{
482-
char*rule;
488+
intnnames;
489+
List*relname;
490+
char*rulename;
491+
RangeVar*rel;
492+
Relationrelation;
483493
HeapTupletuple;
484494
Oidreloid;
485495
Oidruleoid;
486496
Oidclassoid;
487497
int32aclcheck;
488498

489-
/* XXX this is gonna change soon */
490-
if (length(qualname)!=1)
491-
elog(ERROR,"CommentRule: rule name may not be qualified");
492-
rule=strVal(lfirst(qualname));
493-
494-
/* Find the rule's pg_rewrite tuple, get its OID and its table's OID */
499+
/* Separate relname and trig name */
500+
nnames=length(qualname);
501+
if (nnames==1)
502+
{
503+
/* Old-style: only a rule name is given */
504+
RelationRewriteRelation;
505+
HeapScanDescscanDesc;
506+
ScanKeyDatascanKeyData;
507+
508+
rulename=strVal(lfirst(qualname));
509+
510+
/* Search pg_rewrite for such a rule */
511+
ScanKeyEntryInitialize(&scanKeyData,
512+
0,
513+
Anum_pg_rewrite_rulename,
514+
F_NAMEEQ,
515+
PointerGetDatum(rulename));
516+
517+
RewriteRelation=heap_openr(RewriteRelationName,AccessShareLock);
518+
scanDesc=heap_beginscan(RewriteRelation,
519+
0,SnapshotNow,1,&scanKeyData);
520+
521+
tuple=heap_getnext(scanDesc,0);
522+
if (HeapTupleIsValid(tuple))
523+
{
524+
reloid= ((Form_pg_rewrite)GETSTRUCT(tuple))->ev_class;
525+
ruleoid=tuple->t_data->t_oid;
526+
}
527+
else
528+
{
529+
elog(ERROR,"rule '%s' does not exist",rulename);
530+
reloid=ruleoid=0;/* keep compiler quiet */
531+
}
495532

496-
tuple=SearchSysCache(RULENAME,
497-
PointerGetDatum(rule),
498-
0,0,0);
499-
if (!HeapTupleIsValid(tuple))
500-
elog(ERROR,"rule '%s' does not exist",rule);
533+
if (HeapTupleIsValid(tuple=heap_getnext(scanDesc,0)))
534+
elog(ERROR,"There are multiple rules '%s'"
535+
"\n\tPlease specify a relation name as well as a rule name",
536+
rulename);
501537

502-
reloid= ((Form_pg_rewrite)GETSTRUCT(tuple))->ev_class;
503-
ruleoid=tuple->t_data->t_oid;
538+
heap_endscan(scanDesc);
539+
heap_close(RewriteRelation,AccessShareLock);
504540

505-
ReleaseSysCache(tuple);
541+
/* Open the owning relation to ensure it won't go away meanwhile */
542+
relation=heap_open(reloid,AccessShareLock);
543+
}
544+
else
545+
{
546+
/* New-style: rule and relname both provided */
547+
Assert(nnames >=2);
548+
relname=ltruncate(nnames-1,listCopy(qualname));
549+
rulename=strVal(nth(nnames-1,qualname));
550+
551+
/* Open the owning relation to ensure it won't go away meanwhile */
552+
rel=makeRangeVarFromNameList(relname);
553+
relation=heap_openrv(rel,AccessShareLock);
554+
reloid=RelationGetRelid(relation);
555+
556+
/* Find the rule's pg_rewrite tuple, get its OID */
557+
tuple=SearchSysCache(RULERELNAME,
558+
ObjectIdGetDatum(reloid),
559+
PointerGetDatum(rulename),
560+
0,0);
561+
if (!HeapTupleIsValid(tuple))
562+
elog(ERROR,"rule '%s' does not exist",rulename);
563+
Assert(reloid== ((Form_pg_rewrite)GETSTRUCT(tuple))->ev_class);
564+
ruleoid=tuple->t_data->t_oid;
565+
ReleaseSysCache(tuple);
566+
}
506567

507568
/* Check object security */
508569

509570
aclcheck=pg_class_aclcheck(reloid,GetUserId(),ACL_RULE);
510571
if (aclcheck!=ACLCHECK_OK)
511572
elog(ERROR,"you are not permitted to comment on rule '%s'",
512-
rule);
573+
rulename);
513574

514575
/* pg_rewrite doesn't have a hard-coded OID, so must look it up */
515576

0 commit comments

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