Fix a bug introduced in 7.2.

Hiroshi Inoue · Hiroshi Inoue · commit 82ccb420d5c6 · 2002-08-29T23:39:05.000Z
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.285 2002/08/29 07:22:23 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.286 2002/08/29 23:39:05 inoue Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -751,7 +751,7 @@ pg_exec_query_string(StringInfo query_string,		/* string to execute */
 				{
 					elog(DEBUG2, "ProcessQuery");
 
-					if (querytree->originalQuery)
+					if (querytree->originalQuery || length(querytree_list) == 1)
 					{
 						/* original stmt can override default tag string */
 						ProcessQuery(querytree, plan, dest, completionTag);
@@ -1664,7 +1664,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.285 $ $Date: 2002/08/29 07:22:23 $\n");
+		puts("$Revision: 1.286 $ $Date: 2002/08/29 23:39:05 $\n");
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.285 2002/08/29 07:22:23 ishii Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.286 2002/08/29 23:39:05 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -751,7 +751,7 @@ pg_exec_query_string(StringInfo query_string, /* string to execute */`
`751`	`751`	`{`
`752`	`752`	`elog(DEBUG2, "ProcessQuery");`
`753`	`753`
`754`		`- if (querytree->originalQuery)`
	`754`	`+ if (querytree->originalQuery \|\| length(querytree_list) == 1)`
`755`	`755`	`{`
`756`	`756`	`/* original stmt can override default tag string */`
`757`	`757`	`ProcessQuery(querytree, plan, dest, completionTag);`
`@@ -1664,7 +1664,7 @@ PostgresMain(int argc, char argv[], const char username)`
`1664`	`1664`	`if (!IsUnderPostmaster)`
`1665`	`1665`	`{`
`1666`	`1666`	`puts("\nPOSTGRES backend interactive interface ");`
`1667`		`- puts("$Revision: 1.285 $ $Date: 2002/08/29 07:22:23 $\n");`
	`1667`	`+ puts("$Revision: 1.286 $ $Date: 2002/08/29 23:39:05 $\n");`
`1668`	`1668`	`}`
`1669`	`1669`
`1670`	`1670`	`/*`