From d404f1006bdc65e09a7c8e6230bc8e3d1008a297 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 22 Dec 1997 05:42:25 +0000
Subject: Fix for select 1=1 or 2=2, select 1=1 and 2=2, and select sum(2+2).

---
 src/backend/parser/parse_agg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/backend/parser/parse_agg.c')

diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index e552d0aa8c2..e776f695000 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.3 1997/11/26 03:42:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.4 1997/12/22 05:42:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -108,7 +108,7 @@ contain_agg_clause(Node *clause)
 		return contain_agg_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;
 
-- 
cgit v1.2.3