From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 17 Jan 2000 04:43:56 +0000 (+0000)
Subject: Update subquery error message.
X-Git-Tag: REL7_0~815
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3354ab32061bdd0892ed0323a46b561b82860bd;p=postgresql

Update subquery error message.
---

diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 0d41de06d4..319cd01d1a 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.19 1999/12/29 22:57:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.20 2000/01/17 04:43:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -105,7 +105,7 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext, bool *isNull)
 		{
 			/* cannot allow multiple input tuples for EXPR sublink */
 			if (found)
-				elog(ERROR, "More than one tuple returned by subselect used as expression.");
+				elog(ERROR, "More than one tuple returned by a subselect used as an expression.");
 			found = true;
 			/*
 			 * We need to copy the subplan's tuple in case the result is of
@@ -126,7 +126,7 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext, bool *isNull)
 
 		/* cannot allow multiple input tuples for MULTIEXPR sublink either */
 		if (subLinkType == MULTIEXPR_SUBLINK && found)
-			elog(ERROR, "More than one tuple returned by subselect used as expression.");
+			elog(ERROR, "More than one tuple returned by a subselect used as an expression.");
 
 		found = true;
 
@@ -339,7 +339,7 @@ ExecSetParamPlan(SubPlan *node)
 		if (found &&
 			(sublink->subLinkType == EXPR_SUBLINK ||
 			 sublink->subLinkType == MULTIEXPR_SUBLINK))
-			elog(ERROR, "ExecSetParamPlan: more than one tuple returned by expression subselect");
+			elog(ERROR, "More than one tuple returned a subselect used as an expression.");
 
 		found = true;