From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 20 Mar 2015 01:16:42 +0000 (-0400)
Subject: psql:  allow DROP INDEX CONCURRENTLY in AUTOCOMMIT off mode
X-Git-Tag: REL9_5_ALPHA1~595
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=788e799ed4ee9a0e87f18e0426418622972a4de4;p=postgresql

psql:  allow DROP INDEX CONCURRENTLY in AUTOCOMMIT off mode

Previously this threw an error.

Patch by Feike Steenbergen
---

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 275bdcc09f..15488ff035 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -1643,6 +1643,24 @@ command_no_begin(const char *query)
 			return true;
 		if (wordlen == 10 && pg_strncasecmp(query, "tablespace", 10) == 0)
 			return true;
+
+		/* DROP INDEX CONCURRENTLY isn't allowed in xacts */
+		if (wordlen == 5 && pg_strncasecmp(query, "index", 5) == 0)
+		{
+			query += wordlen;
+
+			query = skip_white_space(query);
+
+			wordlen = 0;
+			while (isalpha((unsigned char) query[wordlen]))
+				wordlen += PQmblen(&query[wordlen], pset.encoding);
+
+			if (wordlen == 12 && pg_strncasecmp(query, "concurrently", 12) == 0)
+				return true;
+
+			return false;
+		}
+
 		return false;
 	}