aboutsummaryrefslogtreecommitdiff
path: root/src/bin/psql/common.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2015-03-19 21:16:42 -0400
committerBruce Momjian <bruce@momjian.us>2015-03-19 21:17:10 -0400
commit788e799ed4ee9a0e87f18e0426418622972a4de4 (patch)
tree353749d06130d6af6a175f3a5f3c24a3979d848f /src/bin/psql/common.c
parentbf038899965263dbc4aef2b43c8fdfe6f49b788f (diff)
downloadpostgresql-788e799ed4ee9a0e87f18e0426418622972a4de4.tar.gz
postgresql-788e799ed4ee9a0e87f18e0426418622972a4de4.zip
psql: allow DROP INDEX CONCURRENTLY in AUTOCOMMIT off mode
Previously this threw an error. Patch by Feike Steenbergen
Diffstat (limited to 'src/bin/psql/common.c')
-rw-r--r--src/bin/psql/common.c18
1 files changed, 18 insertions, 0 deletions
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;
}