diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-01-04 04:31:43 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-01-04 04:31:43 +0000 |
| commit | 4b05912f0b6aa69507bc32ac6ddaf8aeecdeb396 (patch) | |
| tree | 2ff63f8cd09f1d5c628cefb16827c406ef40f014 /src/backend/rewrite/locks.c | |
| parent | c629d3b9d65fdce320aba26d092bfe96274c6092 (diff) | |
Fix for count(*), aggs with views and multiple tables and sum(3).
Diffstat (limited to 'src/backend/rewrite/locks.c')
| -rw-r--r-- | src/backend/rewrite/locks.c | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c index d446da653cc..70dc37080e2 100644 --- a/src/backend/rewrite/locks.c +++ b/src/backend/rewrite/locks.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.5 1997/09/08 21:46:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.6 1998/01/04 04:31:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,6 +58,14 @@ nodeThisLockWasTriggered(Node *node, int varno, AttrNumber attnum) nodeThisLockWasTriggered(tle->expr, varno, attnum); } break; + case T_Aggreg: + { + Aggreg *agg = (Aggreg *) node; + + return + nodeThisLockWasTriggered(agg->target, varno, attnum); + } + break; case T_List: { List *l; @@ -87,10 +95,20 @@ thisLockWasTriggered(int varno, AttrNumber attnum, Query *parsetree) { - return - (nodeThisLockWasTriggered(parsetree->qual, varno, attnum) || - nodeThisLockWasTriggered((Node *) parsetree->targetList, - varno, attnum)); + int i; + + if (nodeThisLockWasTriggered(parsetree->qual, varno, attnum)) + return true; + + if (nodeThisLockWasTriggered((Node *) parsetree->targetList, varno, attnum)) + return true; + + for(i=0; i < parsetree->qry_numAgg; i++) + if (nodeThisLockWasTriggered(parsetree->qry_aggs[i]->target, + varno, attnum)) + return true; + return false; + } /* |