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

Commit5fe3da9

Browse files
committed
Revert updatable views
1 parentc0f92b5 commit5fe3da9

31 files changed

+43
-2291
lines changed

‎doc/src/sgml/catalogs.sgml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.191 2009/01/22 20:15:59 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.192 2009/01/27 12:40:14 petere Exp $ -->
22
<!--
33
Documentation of the system catalogs, directed toward PostgreSQL developers
44
-->
@@ -4154,13 +4154,6 @@
41544154
<entry>True if the rule is an <literal>INSTEAD</literal> rule</entry>
41554155
</row>
41564156

4157-
<row>
4158-
<entry><structfield>is_auto</structfield></entry>
4159-
<entry><type>bool</type></entry>
4160-
<entry></entry>
4161-
<entry>True if the rule was automatically generated</entry>
4162-
</row>
4163-
41644157
<row>
41654158
<entry><structfield>ev_qual</structfield></entry>
41664159
<entry><type>text</type></entry>

‎doc/src/sgml/intro.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/intro.sgml,v 1.33 2009/01/22 17:27:54 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/intro.sgml,v 1.34 2009/01/27 12:40:14 petere Exp $ -->
22

33
<preface id="preface">
44
<title>Preface</title>
@@ -110,7 +110,7 @@
110110
<simpara>triggers</simpara>
111111
</listitem>
112112
<listitem>
113-
<simpara>updatableviews</simpara>
113+
<simpara>views</simpara>
114114
</listitem>
115115
<listitem>
116116
<simpara>transactional integrity</simpara>

‎doc/src/sgml/ref/create_view.sgml

Lines changed: 6 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_view.sgml,v 1.40 2009/01/22 17:27:54 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_view.sgml,v 1.41 2009/01/27 12:40:15 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -115,99 +115,11 @@ CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW <replaceable class="PARAMETER">n
115115
<title>Notes</title>
116116

117117
<para>
118-
Some views are updatable, which means that the
119-
commands <command>INSERT</command>, <command>UPDATE</command>,
120-
and <command>DELETE</command> can be used on the view as if it
121-
were a regular table. A view is updatable if it
122-
does <emphasis>not</emphasis> contain:
123-
124-
<itemizedlist>
125-
<listitem>
126-
<para>
127-
more than one underlying table (joins) or no underlying table at all
128-
</para>
129-
</listitem>
130-
131-
<listitem>
132-
<para>
133-
underlying tables/views that are themselves not updatable,
134-
including table value constructors and table functions
135-
</para>
136-
</listitem>
137-
138-
<listitem>
139-
<para>
140-
subqueries in the <literal>FROM</literal> list
141-
</para>
142-
</listitem>
143-
144-
<listitem>
145-
<para>
146-
items in the select list that are not direct references to a
147-
column of the underlying table, such as literals or any
148-
nontrivial value expression
149-
</para>
150-
</listitem>
151-
152-
<listitem>
153-
<para>
154-
references to system columns in the select list
155-
</para>
156-
</listitem>
157-
158-
<listitem>
159-
<para>
160-
more than one reference to the same column in the select list
161-
</para>
162-
</listitem>
163-
164-
<listitem>
165-
<para>aggregate function calls</para>
166-
</listitem>
167-
168-
<listitem>
169-
<para>window function calls</para>
170-
</listitem>
171-
172-
<listitem>
173-
<para>
174-
<literal>WITH</literal> or <literal>WITH RECURSIVE</literal> clauses
175-
</para>
176-
</listitem>
177-
178-
<listitem>
179-
<para>
180-
<literal>DISTINCT</literal>, <literal>GROUP BY</literal>, or
181-
<literal>HAVING</literal> clauses
182-
</para>
183-
</listitem>
184-
185-
<listitem>
186-
<para>
187-
<literal>UNION</literal>, <literal>INTERSECT</literal>, or
188-
<literal>EXCEPT</literal> clauses
189-
</para>
190-
</listitem>
191-
192-
<listitem>
193-
<para>
194-
<literal>LIMIT</literal> or <literal>OFFSET</literal> clauses
195-
(or other equivalent spellings thereof)
196-
</para>
197-
</listitem>
198-
</itemizedlist>
199-
</para>
200-
201-
<para>
202-
The updatable views implementation is based on the rule system.
203-
Because of this, you can also make more complex views updatable or
204-
insertable by creating your own rules that rewrite
205-
the <command>INSERT</command>,
206-
<command>UPDATE</command>, and <command>DELETE</command> actions
207-
on the view into appropriate actions on other tables. You can
208-
also replace the automatically generated rules by your own rules.
209-
For more information on the rule system, refer
210-
to <xref linkend="sql-createrule" endterm="sql-createrule-title">.
118+
Currently, views are read only: the system will not allow an insert,
119+
update, or delete on a view. You can get the effect of an updatable
120+
view by creating rules that rewrite inserts, etc. on the view into
121+
appropriate actions on other tables. For more information see
122+
<xref linkend="sql-createrule" endterm="sql-createrule-title">.
211123
</para>
212124

213125
<para>

‎src/backend/commands/view.c

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.112 2009/01/22 17:27:54 petere Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.113 2009/01/27 12:40:15 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -27,9 +27,7 @@
2727
#include"parser/parse_relation.h"
2828
#include"rewrite/rewriteDefine.h"
2929
#include"rewrite/rewriteManip.h"
30-
#include"rewrite/rewriteRemove.h"
3130
#include"rewrite/rewriteSupport.h"
32-
#include"rewrite/viewUpdate.h"
3331
#include"utils/acl.h"
3432
#include"utils/builtins.h"
3533
#include"utils/lsyscache.h"
@@ -310,28 +308,13 @@ DefineViewRules(Oid viewOid, Query *viewParse, bool replace)
310308
viewOid,
311309
NULL,
312310
CMD_SELECT,
313-
true,/* is_instead */
314-
true,/* is_auto */
311+
true,
315312
replace,
316313
list_make1(viewParse));
317314

318315
/*
319-
* Delete all implicit rules on replace. CreateViewUpdateRules()
320-
* below will re-create them if appropriate for the new view
321-
* definition.
316+
* Someday: automatic ON INSERT, etc
322317
*/
323-
if (replace)
324-
{
325-
Relationrel=heap_open(viewOid,AccessExclusiveLock);
326-
RemoveAutomaticRulesOnEvent(rel,CMD_INSERT);
327-
RemoveAutomaticRulesOnEvent(rel,CMD_DELETE);
328-
RemoveAutomaticRulesOnEvent(rel,CMD_UPDATE);
329-
heap_close(rel,NoLock);
330-
}
331-
332-
CommandCounterIncrement();
333-
334-
CreateViewUpdateRules(viewOid,viewParse);
335318
}
336319

337320
/*---------------------------------------------------------------

‎src/backend/rewrite/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for rewrite
55
#
66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/backend/rewrite/Makefile,v 1.18 2009/01/22 17:27:54 petere Exp $
7+
# $PostgreSQL: pgsql/src/backend/rewrite/Makefile,v 1.19 2009/01/27 12:40:15 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,7 +13,6 @@ top_builddir = ../../..
1313
include$(top_builddir)/src/Makefile.global
1414

1515
OBJS = rewriteRemove.o rewriteDefine.o\
16-
rewriteHandler.o rewriteManip.o rewriteSupport.o\
17-
viewUpdate.o
16+
rewriteHandler.o rewriteManip.o rewriteSupport.o
1817

1918
include$(top_srcdir)/src/backend/common.mk

‎src/backend/rewrite/rewriteDefine.c

Lines changed: 2 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.135 2009/01/22 17:27:54 petere Exp $
11+
* $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.136 2009/01/27 12:40:15 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515
#include"postgres.h"
1616

1717
#include"access/heapam.h"
18-
#include"access/xact.h"
1918
#include"catalog/dependency.h"
2019
#include"catalog/indexing.h"
2120
#include"catalog/namespace.h"
@@ -26,7 +25,6 @@
2625
#include"parser/parse_utilcmd.h"
2726
#include"rewrite/rewriteDefine.h"
2827
#include"rewrite/rewriteManip.h"
29-
#include"rewrite/rewriteRemove.h"
3028
#include"rewrite/rewriteSupport.h"
3129
#include"utils/acl.h"
3230
#include"utils/builtins.h"
@@ -41,7 +39,6 @@ static void checkRuleResultList(List *targetList, TupleDesc resultDesc,
4139
boolisSelect);
4240
staticboolsetRuleCheckAsUser_walker(Node*node,Oid*context);
4341
staticvoidsetRuleCheckAsUser_Query(Query*qry,Oiduserid);
44-
staticconstchar*rule_event_string(CmdTypeevtype);
4542

4643

4744
/*
@@ -55,7 +52,6 @@ InsertRule(char *rulname,
5552
Oideventrel_oid,
5653
AttrNumberevslot_index,
5754
boolevinstead,
58-
boolis_auto,
5955
Node*event_qual,
6056
List*action,
6157
boolreplace)
@@ -88,7 +84,6 @@ InsertRule(char *rulname,
8884
values[i++]=CharGetDatum(evtype+'0');/* ev_type */
8985
values[i++]=CharGetDatum(RULE_FIRES_ON_ORIGIN);/* ev_enabled */
9086
values[i++]=BoolGetDatum(evinstead);/* is_instead */
91-
values[i++]=BoolGetDatum(is_auto);/* is_auto */
9287
values[i++]=CStringGetTextDatum(evqual);/* ev_qual */
9388
values[i++]=CStringGetTextDatum(actiontree);/* ev_action */
9489

@@ -107,11 +102,7 @@ InsertRule(char *rulname,
107102

108103
if (HeapTupleIsValid(oldtup))
109104
{
110-
/*
111-
* If REPLACE was not used we still check if the old rule is
112-
* automatic: Then we replace it anyway.
113-
*/
114-
if (!replace&& !((Form_pg_rewrite)GETSTRUCT(oldtup))->is_auto)
105+
if (!replace)
115106
ereport(ERROR,
116107
(errcode(ERRCODE_DUPLICATE_OBJECT),
117108
errmsg("rule \"%s\" for relation \"%s\" already exists",
@@ -124,7 +115,6 @@ InsertRule(char *rulname,
124115
replaces[Anum_pg_rewrite_ev_attr-1]= true;
125116
replaces[Anum_pg_rewrite_ev_type-1]= true;
126117
replaces[Anum_pg_rewrite_is_instead-1]= true;
127-
replaces[Anum_pg_rewrite_is_auto-1]= true;
128118
replaces[Anum_pg_rewrite_ev_qual-1]= true;
129119
replaces[Anum_pg_rewrite_ev_action-1]= true;
130120

@@ -215,7 +205,6 @@ DefineRule(RuleStmt *stmt, const char *queryString)
215205
whereClause,
216206
stmt->event,
217207
stmt->instead,
218-
false,/* not is_auto */
219208
stmt->replace,
220209
actions);
221210
}
@@ -234,7 +223,6 @@ DefineQueryRewrite(char *rulename,
234223
Node*event_qual,
235224
CmdTypeevent_type,
236225
boolis_instead,
237-
boolis_auto,
238226
boolreplace,
239227
List*action)
240228
{
@@ -458,42 +446,6 @@ DefineQueryRewrite(char *rulename,
458446
RelationGetDescr(event_relation),
459447
false);
460448
}
461-
462-
/*
463-
* If defining a non-automatic DO INSTEAD rule, drop all
464-
* automatic rules on the same event.
465-
*/
466-
if (!is_auto&&is_instead)
467-
{
468-
RemoveAutomaticRulesOnEvent(event_relation,event_type);
469-
CommandCounterIncrement();
470-
}
471-
472-
/*
473-
* If defining an automatic rule and there is a manual rule on
474-
* the same event, warn and don't do it.
475-
*/
476-
if (is_auto&&event_relation->rd_rules!=NULL)
477-
{
478-
inti;
479-
480-
for (i=0;i<event_relation->rd_rules->numLocks;i++)
481-
{
482-
RewriteRule*rule=event_relation->rd_rules->rules[i];
483-
484-
if (rule->event==event_type&& !rule->is_auto&&rule->isInstead==is_instead)
485-
{
486-
ereport(WARNING,
487-
(errmsg("automatic %s rule not created because manually created %s rule exists",
488-
rule_event_string(event_type),rule_event_string(event_type)),
489-
errhint("If you prefer to have the automatic rule, drop the manually created rule and run CREATE OR REPLACE VIEW again.")));
490-
491-
heap_close(event_relation,NoLock);
492-
return;
493-
}
494-
}
495-
}
496-
497449
}
498450

499451
/*
@@ -509,7 +461,6 @@ DefineQueryRewrite(char *rulename,
509461
event_relid,
510462
event_attno,
511463
is_instead,
512-
is_auto,
513464
event_qual,
514465
action,
515466
replace);
@@ -803,16 +754,3 @@ RenameRewriteRule(Oid owningRel, const char *oldName,
803754
}
804755

805756
#endif
806-
807-
808-
staticconstchar*
809-
rule_event_string(CmdTypetype)
810-
{
811-
if (type==CMD_INSERT)
812-
return"INSERT";
813-
if (type==CMD_UPDATE)
814-
return"UPDATE";
815-
if (type==CMD_DELETE)
816-
return"DELETE";
817-
return"???";
818-
}

0 commit comments

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