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

Commita51f004

Browse files
committed
Repair breakage of rules containing INSERT ... SELECT actions, per bug
report from Joel Burton. Turns out that my simple idea of turning theSELECT into a subquery does not interact well *at all* with the way therule rewriter works. Really what we need to make INSERT ... SELECT workcleanly is to decouple targetlists from rangetables: an INSERT ... SELECTwants to have two levels of targetlist but only one rangetable. No timefor that for 7.1, however, so I've inserted some ugly hacks to make therewriter know explicitly about the structure of INSERT ... SELECT queries.Ugh :-(
1 parentd946604 commita51f004

File tree

5 files changed

+263
-207
lines changed

5 files changed

+263
-207
lines changed

‎src/backend/parser/analyze.c‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
*$Id: analyze.c,v 1.168 2000/11/24 20:16:39 petere Exp $
9+
*$Id: analyze.c,v 1.169 2000/12/05 19:15:10 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -312,7 +312,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
312312
*/
313313
if (stmt->selectStmt)
314314
{
315-
List*selectList;
315+
ParseState*sub_pstate=make_parsestate(pstate->parentParseState);
316316
Query*selectQuery;
317317
RangeTblEntry*rte;
318318
RangeTblRef*rtr;
@@ -324,11 +324,18 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
324324
* otherwise the behavior of SELECT within INSERT might be different
325325
* from a stand-alone SELECT. (Indeed, Postgres up through 6.5 had
326326
* bugs of just that nature...)
327+
*
328+
* If a non-nil rangetable was passed in, pass it down to the SELECT.
329+
* This can only happen if we are inside a CREATE RULE, and in that
330+
* case we want the rule's OLD and NEW rtable entries to appear as
331+
* part of the SELECT's rtable, not as outer references for it.
327332
*/
328-
selectList=parse_analyze(stmt->selectStmt,pstate);
329-
Assert(length(selectList)==1);
333+
sub_pstate->p_rtable=pstate->p_rtable;
334+
pstate->p_rtable=NIL;
335+
selectQuery=transformStmt(sub_pstate,stmt->selectStmt);
336+
release_pstate_resources(sub_pstate);
337+
pfree(sub_pstate);
330338

331-
selectQuery= (Query*)lfirst(selectList);
332339
Assert(IsA(selectQuery,Query));
333340
Assert(selectQuery->commandType==CMD_SELECT);
334341
if (selectQuery->into||selectQuery->isPortal)
@@ -1587,7 +1594,8 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt)
15871594
foreach(actions,stmt->actions)
15881595
{
15891596
ParseState*sub_pstate=make_parsestate(pstate->parentParseState);
1590-
Query*sub_qry;
1597+
Query*sub_qry,
1598+
*top_subqry;
15911599
boolhas_old,
15921600
has_new;
15931601

@@ -1608,7 +1616,14 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt)
16081616
newrte->checkForRead= false;
16091617

16101618
/* Transform the rule action statement */
1611-
sub_qry=transformStmt(sub_pstate,lfirst(actions));
1619+
top_subqry=transformStmt(sub_pstate,lfirst(actions));
1620+
1621+
/*
1622+
* If the action is INSERT...SELECT, OLD/NEW have been pushed
1623+
* down into the SELECT, and that's what we need to look at.
1624+
* (Ugly kluge ... try to fix this when we redesign querytrees.)
1625+
*/
1626+
sub_qry=getInsertSelectQuery(top_subqry,NULL);
16121627

16131628
/*
16141629
* Validate action's use of OLD/NEW, qual too
@@ -1648,15 +1663,28 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt)
16481663
/*
16491664
* For efficiency's sake, add OLD to the rule action's jointree
16501665
* only if it was actually referenced in the statement or qual.
1651-
* NEW is not really a relation and should never be added.
1666+
*
1667+
* For INSERT, NEW is not really a relation (only a reference to
1668+
* the to-be-inserted tuple) and should never be added to the
1669+
* jointree.
1670+
*
1671+
* For UPDATE, we treat NEW as being another kind of reference to
1672+
* OLD, because it represents references to *transformed* tuples
1673+
* of the existing relation. It would be wrong to enter NEW
1674+
* separately in the jointree, since that would cause a double
1675+
* join of the updated relation. It's also wrong to fail to make
1676+
* a jointree entry if only NEW and not OLD is mentioned.
16521677
*/
1653-
if (has_old)
1678+
if (has_old|| (has_new&&stmt->event==CMD_UPDATE))
16541679
{
1680+
/* hack so we can use addRTEtoJoinList() */
1681+
sub_pstate->p_rtable=sub_qry->rtable;
1682+
sub_pstate->p_joinlist=sub_qry->jointree->fromlist;
16551683
addRTEtoJoinList(sub_pstate,oldrte);
16561684
sub_qry->jointree->fromlist=sub_pstate->p_joinlist;
16571685
}
16581686

1659-
lfirst(actions)=sub_qry;
1687+
lfirst(actions)=top_subqry;
16601688

16611689
release_pstate_resources(sub_pstate);
16621690
pfree(sub_pstate);

‎src/backend/rewrite/rewriteDefine.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.55 2000/10/26 21:36:50 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.56 2000/12/05 19:15:09 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -24,6 +24,7 @@
2424
#include"optimizer/clauses.h"
2525
#include"parser/parse_relation.h"
2626
#include"rewrite/rewriteDefine.h"
27+
#include"rewrite/rewriteManip.h"
2728
#include"rewrite/rewriteSupport.h"
2829
#include"storage/smgr.h"
2930
#include"utils/builtins.h"
@@ -205,16 +206,17 @@ DefineQueryRewrite(RuleStmt *stmt)
205206
foreach(l,action)
206207
{
207208
query= (Query*)lfirst(l);
209+
if (query->resultRelation==0)
210+
continue;
211+
/* Don't be fooled by INSERT/SELECT */
212+
if (query!=getInsertSelectQuery(query,NULL))
213+
continue;
208214
if (query->resultRelation==PRS2_OLD_VARNO)
209-
{
210215
elog(ERROR,"rule actions on OLD currently not supported"
211216
"\n\tuse views or triggers instead");
212-
}
213217
if (query->resultRelation==PRS2_NEW_VARNO)
214-
{
215218
elog(ERROR,"rule actions on NEW currently not supported"
216219
"\n\tuse triggers instead");
217-
}
218220
}
219221

220222
/*

0 commit comments

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