|
7 | 7 | * Portions Copyright (c) 1994, Regents of the University of California |
8 | 8 | * |
9 | 9 | * IDENTIFICATION |
10 | | - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.151 2005/04/28 21:47:14 tgl Exp $ |
| 10 | + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.152 2005/05/29 18:34:57 tgl Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
@@ -699,7 +699,6 @@ ApplyRetrieveRule(Query *parsetree, |
699 | 699 | intrt_index, |
700 | 700 | boolrelation_level, |
701 | 701 | Relationrelation, |
702 | | -boolrelIsUsed, |
703 | 702 | List*activeRIRs) |
704 | 703 | { |
705 | 704 | Query*rule_action; |
@@ -870,7 +869,6 @@ fireRIRrules(Query *parsetree, List *activeRIRs) |
870 | 869 | RuleLock*rules; |
871 | 870 | RewriteRule*rule; |
872 | 871 | LOCKMODElockmode; |
873 | | -boolrelIsUsed; |
874 | 872 | inti; |
875 | 873 |
|
876 | 874 | ++rt_index; |
@@ -901,9 +899,8 @@ fireRIRrules(Query *parsetree, List *activeRIRs) |
901 | 899 | * part of the join set (a source table), or is referenced by any |
902 | 900 | * Var nodes, or is the result table. |
903 | 901 | */ |
904 | | -relIsUsed=rangeTableEntry_used((Node*)parsetree,rt_index,0); |
905 | | - |
906 | | -if (!relIsUsed&&rt_index!=parsetree->resultRelation) |
| 902 | +if (rt_index!=parsetree->resultRelation&& |
| 903 | +!rangeTableEntry_used((Node*)parsetree,rt_index,0)) |
907 | 904 | continue; |
908 | 905 |
|
909 | 906 | /* |
@@ -978,7 +975,6 @@ fireRIRrules(Query *parsetree, List *activeRIRs) |
978 | 975 | rt_index, |
979 | 976 | rule->attrno==-1, |
980 | 977 | rel, |
981 | | -relIsUsed, |
982 | 978 | activeRIRs); |
983 | 979 | } |
984 | 980 |
|
|