Commit649ffe1

committed

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

by subselect used as expression."

1 parente1b212f commit649ffe1Copy full SHA for 649ffe1

File tree

-10

lines changed

-10

lines changed

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,3 @@`
`1`		`-From: "Joost Kraaijeveld" <JKraaijeveld@askesis.nl>`
`2`		`-To: "Pgsql-Ports@Postgresql. Org" <pgsql-ports@postgreSQL.org>`
`3`		`-Subject: RE: [PORTS] Re: psql under win32`
`4`		`-Date: Wed, 21 Apr 1999 07:07:47 +0200`
`5`		`-Message-ID: <000001be8bb4$e59b0ab0$0300a8c0@abraracourcix.askesis.nl>`
`6`		`-MIME-Version: 1.0`
`7`		`-`
`8`	`1`	`Installing PostgreSQL on NT:`
`9`	`2`
`10`	`3`	`---------------------------------------------------------------------------`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.18 1999/12/16 22:19:44 wieck Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.19 1999/12/29 22:57:17 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -105,7 +105,7 @@ ExecSubPlan(SubPlan node, List pvar, ExprContext econtext, bool isNull)`
`105`	`105`	`{`
`106`	`106`	`/* cannot allow multiple input tuples for EXPR sublink */`
`107`	`107`	`if (found)`
`108`		`-elog(ERROR,"ExecSubPlan: morethan one tuple returned byexpressionsubselect");`
	`108`	`+elog(ERROR,"Morethan one tuple returned by subselect used as expression.");`
`109`	`109`	`found= true;`
`110`	`110`	`/*`
`111`	`111`	`* 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)`
`126`	`126`
`127`	`127`	`/* cannot allow multiple input tuples for MULTIEXPR sublink either */`
`128`	`128`	`if (subLinkType==MULTIEXPR_SUBLINK&&found)`
`129`		`-elog(ERROR,"ExecSubPlan: morethan one tuple returned byexpressionsubselect");`
	`129`	`+elog(ERROR,"Morethan one tuple returned by subselect used as expression.");`
`130`	`130`
`131`	`131`	`found= true;`
`132`	`132`

Comments

(0)