From 62b6aaa40b2abb26edf18d1cd00dffcac090f67a Mon Sep 17 00:00:00 2001 From: Itagaki Takahiro Date: Tue, 28 Sep 2010 15:55:25 +0900 Subject: [PATCH] Only DISCARD ALL should be in the command_no_begin list. We allowes DISCARD PLANS and TEMP in a transaction. --- src/bin/psql/common.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 7ba2f73c5d..50e4077343 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -1388,8 +1388,20 @@ command_no_begin(const char *query) return true; } + /* DISCARD ALL isn't allowed in xacts, but other variants are allowed. */ if (wordlen == 7 && pg_strncasecmp(query, "discard", 7) == 0) - return true; + { + query += wordlen; + + query = skip_white_space(query); + + wordlen = 0; + while (isalpha((unsigned char) query[wordlen])) + wordlen += PQmblen(&query[wordlen], pset.encoding); + + if (wordlen == 3 && pg_strncasecmp(query, "all", 3) == 0) + return true; + } return false; } -- 2.40.0