summaryrefslogtreecommitdiff
path: root/src/backend/optimizer/util/var.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1997-12-22 05:42:25 +0000
committerBruce Momjian <bruce@momjian.us>1997-12-22 05:42:25 +0000
commitd404f1006bdc65e09a7c8e6230bc8e3d1008a297 (patch)
treef6491e4242a07b9d2df9b36d2bfd3ede713460e0 /src/backend/optimizer/util/var.c
parent78a055a6593efb8e64ad2edac2c86b680c177ad2 (diff)
Fix for select 1=1 or 2=2, select 1=1 and 2=2, and select sum(2+2).
Diffstat (limited to 'src/backend/optimizer/util/var.c')
-rw-r--r--src/backend/optimizer/util/var.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 2f7c080910d..7ba3ce5d975 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.6 1997/09/08 21:45:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.7 1997/12/22 05:42:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -85,7 +85,7 @@ contain_var_clause(Node *clause)
return contain_var_clause(((Iter *) clause)->iterexpr);
else if (single_node(clause))
return FALSE;
- else if (or_clause(clause))
+ else if (or_clause(clause) || and_clause(clause))
{
List *temp;
@@ -156,7 +156,7 @@ pull_var_clause(Node *clause)
retval = pull_var_clause(((Iter *) clause)->iterexpr);
else if (single_node(clause))
retval = NIL;
- else if (or_clause(clause))
+ else if (or_clause(clause) || and_clause(clause))
{
List *temp;