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

by subselect used as expression."
This commit is contained in:
Bruce Momjian 1999-12-29 22:57:17 +00:00
parent e1b212ff3b
commit 649ffe1616
2 changed files with 3 additions and 10 deletions

View File

@ -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: Installing PostgreSQL on NT:
--------------------------------------------------------------------------- ---------------------------------------------------------------------------

View File

@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * 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 */ /* cannot allow multiple input tuples for EXPR sublink */
if (found) 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; found = true;
/* /*
* We need to copy the subplan's tuple in case the result is of * 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 */ /* cannot allow multiple input tuples for MULTIEXPR sublink either */
if (subLinkType == MULTIEXPR_SUBLINK && found) 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; found = true;