database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-09 22:41:56 +03:00
Code Activity

Revert some changes from the INTERSECT/EXPECT patch that broke

Browse Source 
rule system semantics by having Var nodes referenced across multiple
parsetrees when rules split them.

Added more tests to the rules regression test.

The code in question resulted from v6.3 based development and was
a little careless applied to the v6.5 source tree.

Jan
This commit is contained in:
Jan Wieck
1999-02-08 01:39:46 +00:00
parent bd422fbce2
commit 566c712c58
3 changed files with 407 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/backend/rewrite/rewriteManip.c
View File

@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.27 1999/02/03 21:17:07 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.28 1999/02/08 01:39:45 wieck Exp $
*
*-------------------------------------------------------------------------
*/
@ -496,8 +496,9 @@ AddQual(Query *parsetree, Node *qual)
return;
/***S*I***/
/* copy = copyObject(qual); */
copy = qual;
/* INTERSECT want's the original, but we need to copy - Jan */
/* copy = qual; */
copy = copyObject(qual);
old = parsetree->qual;
if (old == NULL)
@ -518,8 +519,9 @@ AddHavingQual(Query *parsetree, Node *havingQual)
return;
/***S*I***/
copy = havingQual;
/* copy = copyObject(havingQual); */
/* INTERSECT want's the original, but we need to copy - Jan */
/* copy = havingQual; */
copy = copyObject(havingQual);
old = parsetree->havingQual;
if (old == NULL)
@ -537,8 +539,9 @@ AddNotHavingQual(Query *parsetree, Node *havingQual)
return;
/***S*I***/
/* copy = (Node *)make_notclause( (Expr *)copyObject(havingQual)); */
copy = (Node *) make_notclause((Expr *)havingQual);
/* INTERSECT want's the original, but we need to copy - Jan */
/* copy = (Node *) make_notclause((Expr *)havingQual); */
copy = (Node *)make_notclause( (Expr *)copyObject(havingQual));
AddHavingQual(parsetree, copy);
}
@ -552,8 +555,9 @@ AddNotQual(Query *parsetree, Node *qual)
return;
/***S*I***/
/* copy = (Node *) make_notclause((Expr *)copyObject(qual)); */
copy = (Node *) make_notclause((Expr *)qual);
/* INTERSECT want's the original, but we need to copy - Jan */
/* copy = (Node *) make_notclause((Expr *)qual); */
copy = (Node *) make_notclause((Expr *)copyObject(qual));
AddQual(parsetree, copy);
}
@ -1052,9 +1056,14 @@ nodeHandleViewRule(Node **nodePtr,
* will run into troubles using aggregates (aggno will not
* be set correctly
*/
/* pfree(lfirst(((Expr *) lfirst(sublink->oper))->args)); */
pfree(lfirst(((Expr *) lfirst(sublink->oper))->args));
lfirst(((Expr *) lfirst(sublink->oper))->args) =
lfirst(sublink->lefthand);
/***S*I***/
/* INTERSECT want's this - Jan */
/*
tmp_lefthand = sublink->lefthand;
foreach(tmp_oper, sublink->oper)
{
@ -1062,6 +1071,7 @@ nodeHandleViewRule(Node **nodePtr,
lfirst(tmp_lefthand);
tmp_lefthand = lnext(tmp_lefthand);
}
*/
}
break;
default: