From 788e799ed4ee9a0e87f18e0426418622972a4de4 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 19 Mar 2015 21:16:42 -0400 Subject: [PATCH] psql: allow DROP INDEX CONCURRENTLY in AUTOCOMMIT off mode Previously this threw an error. Patch by Feike Steenbergen --- src/bin/psql/common.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 275bdcc09ff..15488ff0357 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; } -- 2.39.5