From 148486fe1496dee668c64b60b0e1864940a2283c Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Mon, 28 Nov 2016 18:14:18 +0900
Subject: [PATCH 14/17] Simplify completion for DROP INDEX.

Simplify completion for DROP INDEX by removing CONCURRENTLY.
---
 src/bin/psql/tab-complete.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index c94ce20..2d22825 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -2211,12 +2211,10 @@ psql_completion_internal(const char *text, char **previous_words,
 	if (Matches2("DROP", "INDEX"))
 		COMPLETE_WITH_SCHEMA_QUERY_KW(Query_for_list_of_indexes,
 									  ADDLIST1("CONCURRENTLY"));
-	if (Matches3("DROP", "INDEX", "CONCURRENTLY"))
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes);
+	/* Remove CONCURRENTLY */
+	HeadMatchAndRemove3(3, 1, "DROP", "INDEX", "CONCURRENTLY");
 	if (Matches3("DROP", "INDEX", MatchAny))
 		COMPLETE_WITH_LIST2("CASCADE", "RESTRICT");
-	if (Matches4("DROP", "INDEX", "CONCURRENTLY", MatchAny))
-		COMPLETE_WITH_LIST2("CASCADE", "RESTRICT");
 
 	/* DROP MATERIALIZED VIEW */
 	if (Matches2("DROP", "MATERIALIZED"))
-- 
2.9.2

