Improve subquery error message, now says "More than one tuple returned

bmomjian · bmomjian · commit 649ffe161653 · 1999-12-29T22:57:17.000Z
by subselect used as expression."
diff --git a/doc/README.NT b/doc/README.NT
@@ -1,10 +1,3 @@
-From: "Joost Kraaijeveld" <JKraaijeveld@askesis.nl>
-To: "Pgsql-Ports@Postgresql. Org" <pgsql-ports@postgreSQL.org>
-Subject: RE: [PORTS] Re: psql under win32
-Date: Wed, 21 Apr 1999 07:07:47 +0200
-Message-ID: <000001be8bb4$e59b0ab0$0300a8c0@abraracourcix.askesis.nl>
-MIME-Version: 1.0
-
 Installing PostgreSQL on NT:
 
 ---------------------------------------------------------------------------
diff --git 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.18 1999/12/16 22:19:44 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.19 1999/12/29 22:57:17 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, "ExecSubPlan: more than one tuple returned by expression subselect");
+				elog(ERROR, "More than one tuple returned by subselect used as 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, "ExecSubPlan: more than one tuple returned by expression subselect");
+			elog(ERROR, "More than one tuple returned by subselect used as expression.");
 
 		found = true;
 

-Original file line number
+Diff line change
@@ @@ -1,10 +1,3 @@ @@
 -From: "Joost Kraaijeveld" <[email protected]>
 -To: "Pgsql-Ports@Postgresql. Org" <[email protected]>
 -Subject: RE: [PORTS] Re: psql under win32
 -Date: Wed, 21 Apr 1999 07:07:47 +0200
 -Message-ID: <[email protected]>
 -MIME-Version: 1.0
+-
 Installing PostgreSQL on NT:
 ---------------------------------------------------------------------------