Some bugs in psql_complete of psql

>From 7b42a01556ef2ea2291e1d4748a9bf0f80046069 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Mon, 2 Nov 2015 14:10:53 +0900
Subject: [PATCH] Fix some tab-completino bugs.

  - 'ALTER [TABLE|xx] xxx ALL IN TABLE SPACE xx OWNED BY' cannot be completed.
  - CONCURRENTLY in CREATE INDEX is misplaced.
  - Preposition list of SECURITY LABEL is not terminated.
  - The target list of SECURITY LABEL ON misses some alternatives.
---
 src/bin/psql/tab-complete.c | 55 +++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 0e8d395..5a3930f 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -1040,7 +1040,7 @@ psql_completion(const char *text, int start, int end)
 			 pg_strcasecmp(prev5_wd, "IN") == 0 &&
 			 pg_strcasecmp(prev4_wd, "TABLESPACE") == 0 &&
 			 pg_strcasecmp(prev2_wd, "OWNED") == 0 &&
-			 pg_strcasecmp(prev4_wd, "BY") == 0)
+			 pg_strcasecmp(prev_wd, "BY") == 0)
 	{
 		COMPLETE_WITH_QUERY(Query_for_list_of_roles);
 	}
@@ -2320,35 +2320,35 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
 								   " UNION SELECT 'ON'"
 								   " UNION SELECT 'CONCURRENTLY'");
+	/* If we have INDEX CONCURRENTLY <sth>, then add exiting indexes */
+	else if (pg_strcasecmp(prev2_wd, "INDEX") == 0 &&
+			 pg_strcasecmp(prev_wd, "CONCURRENTLY") == 0)
+			 COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes, NULL);
 	/* Complete ... INDEX [<name>] ON with a list of tables  */
 	else if ((pg_strcasecmp(prev3_wd, "INDEX") == 0 ||
-			  pg_strcasecmp(prev2_wd, "INDEX") == 0 ||
-			  pg_strcasecmp(prev2_wd, "CONCURRENTLY") == 0) &&
+			  (pg_strcasecmp(prev4_wd, "INDEX") == 0 &&
+			   pg_strcasecmp(prev3_wd, "CONCURRENTLY") == 0)) &&
 			 pg_strcasecmp(prev_wd, "ON") == 0)
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
-	/* If we have CREATE|UNIQUE INDEX <sth> CONCURRENTLY, then add "ON" */
-	else if ((pg_strcasecmp(prev3_wd, "INDEX") == 0 ||
-			  pg_strcasecmp(prev2_wd, "INDEX") == 0) &&
-			 pg_strcasecmp(prev_wd, "CONCURRENTLY") == 0)
+	/* If we have CREATE|UNIQUE INDEX [CONCURRENTLY] [<sth>], then add "ON" */
+	else if (((pg_strcasecmp(prev3_wd, "CREATE") == 0 ||
+			   pg_strcasecmp(prev3_wd, "UNIQUE") == 0) &&
+			  pg_strcasecmp(prev2_wd, "INDEX") == 0 &&
+			  pg_strcasecmp(prev_wd, "CONCURRENTLY") != 0 &&
+			  pg_strcasecmp(prev_wd, "ON") != 0) ||
+			 ((pg_strcasecmp(prev4_wd, "CREATE") == 0 ||
+			   pg_strcasecmp(prev4_wd, "UNIQUE") == 0) &&
+			  pg_strcasecmp(prev3_wd, "INDEX") == 0 &&
+			  pg_strcasecmp(prev2_wd, "CONCURRENTLY") == 0))
 		COMPLETE_WITH_CONST("ON");
-	/* If we have CREATE|UNIQUE INDEX <sth>, then add "ON" or "CONCURRENTLY" */
-	else if ((pg_strcasecmp(prev3_wd, "CREATE") == 0 ||
-			  pg_strcasecmp(prev3_wd, "UNIQUE") == 0) &&
-			 pg_strcasecmp(prev2_wd, "INDEX") == 0)
-	{
-		static const char *const list_CREATE_INDEX[] =
-		{"CONCURRENTLY", "ON", NULL};
-
-		COMPLETE_WITH_LIST(list_CREATE_INDEX);
-	}
 
 	/*
-	 * Complete INDEX <name> ON <table> with a list of table columns (which
-	 * should really be in parens)
+	 * Complete INDEX [CONCURRENTLY] <name> ON <table> with a list of table
+	 * columns (which should really be in parens)
 	 */
 	else if ((pg_strcasecmp(prev4_wd, "INDEX") == 0 ||
-			  pg_strcasecmp(prev3_wd, "INDEX") == 0 ||
-			  pg_strcasecmp(prev3_wd, "CONCURRENTLY") == 0) &&
+			  (pg_strcasecmp(prev5_wd, "INDEX") == 0 &&
+			   pg_strcasecmp(prev4_wd, "CONCURRENTLY") == 0)) &&
 			 pg_strcasecmp(prev2_wd, "ON") == 0)
 	{
 		static const char *const list_CREATE_INDEX2[] =
@@ -2357,8 +2357,8 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_CREATE_INDEX2);
 	}
 	else if ((pg_strcasecmp(prev5_wd, "INDEX") == 0 ||
-			  pg_strcasecmp(prev4_wd, "INDEX") == 0 ||
-			  pg_strcasecmp(prev4_wd, "CONCURRENTLY") == 0) &&
+			  (pg_strcasecmp(prev6_wd, "INDEX") == 0 &&
+			   pg_strcasecmp(prev5_wd, "CONCURRENTLY") == 0)) &&
 			 pg_strcasecmp(prev3_wd, "ON") == 0 &&
 			 pg_strcasecmp(prev_wd, "(") == 0)
 		COMPLETE_WITH_ATTR(prev2_wd, "");
@@ -3555,7 +3555,7 @@ psql_completion(const char *text, int start, int end)
 			 pg_strcasecmp(prev_wd, "LABEL") == 0)
 	{
 		static const char *const list_SECURITY_LABEL_preposition[] =
-		{"ON", "FOR"};
+			{"ON", "FOR", NULL};
 
 		COMPLETE_WITH_LIST(list_SECURITY_LABEL_preposition);
 	}
@@ -3572,9 +3572,10 @@ psql_completion(const char *text, int start, int end)
 			  pg_strcasecmp(prev_wd, "ON") == 0))
 	{
 		static const char *const list_SECURITY_LABEL[] =
-		{"LANGUAGE", "SCHEMA", "SEQUENCE", "TABLE", "TYPE", "VIEW",
-			"MATERIALIZED VIEW", "COLUMN", "AGGREGATE", "FUNCTION", "DOMAIN",
-		"LARGE OBJECT", NULL};
+			{"TABLE", "COLUMN", "AGGREGATE", "DATABASE", "DOMAIN",
+			 "EVENT TRIGGER", "FOREIGN TABLE", "FUNCTION", "LARGE OBJECT",
+			 "MATERIALIZED VIEW", "LANGUAGE", "ROLE", "SCHEMA", 
+			 "SEQUENCE", "TABLESPACE", "TYPE", "VIEW", NULL};
 
 		COMPLETE_WITH_LIST(list_SECURITY_LABEL);
 	}
-- 
1.8.3.1

>From 5488edb6ebdd253b1a10179ac119cc1588459791 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Tue, 22 Dec 2015 11:03:16 +0900
Subject: [PATCH] Fix tab-complete of CREATE INDEX

Completion for CREATE INDEX added CONCURRENLTY into wrong place, and
it didn't suggest "IF NOT EXISTS". This patch corrects and adds them.
---
 src/bin/psql/tab-complete.c | 59 +++++++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 1a7d184..9f557b3 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -1922,36 +1922,63 @@ psql_completion(const char *text, int start, int end)
 	else if (TailMatches2("CREATE|UNIQUE", "INDEX"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
 								   " UNION SELECT 'ON'"
+								   " UNION SELECT 'IF NOT EXISTS'"
 								   " UNION SELECT 'CONCURRENTLY'");
-	/* Complete ... INDEX [<name>] ON with a list of tables  */
-	else if (TailMatches3("INDEX", MatchAny, "ON") ||
-			 TailMatches2("INDEX|CONCURRENTLY", "ON"))
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
-	/* If we have CREATE|UNIQUE INDEX <sth> CONCURRENTLY, then add "ON" */
-	else if (TailMatches3("INDEX", MatchAny, "CONCURRENTLY") ||
-			 TailMatches2("INDEX", "CONCURRENTLY"))
+	/*
+	 * If we have CREATE [UNIQUE] INDEX [CONCURRENTLY], suggest existing
+	 * indexes or ON/IF NOT EXISTS.
+	 */
+	else if (TailMatches2("INDEX", "CONCURRENTLY"))
+		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
+								   " UNION SELECT 'ON'"
+								   " UNION SELECT 'IF NOT EXISTS'");
+	/*
+	 * If we have CREATE [UNIQUE] INDEX [CONCURRENTLY] IF NOT EXISTS, suggest
+	 * existing indexes
+	 */
+	else if (TailMatches4("INDEX|CONCURRENTLY", "IF", "NOT", "EXISTS"))
+		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes, NULL);
+	/*
+	 * If we have CREATE [UNIQUE] INDEX [CONCURRENTLY] [IF NOT EXISTS sth],
+	 * then add "ON"
+	 */
+	else if (TailMatches5("INDEX|CONCURRENTLY",
+						  "IF", "NOT", "EXISTS", MatchAny) ||
+			 TailMatches2("INDEX|CONCURRENTLY", "!ON"))
 		COMPLETE_WITH_CONST("ON");
-	/* If we have CREATE|UNIQUE INDEX <sth>, then add "ON" or "CONCURRENTLY" */
-	else if (TailMatches3("CREATE|UNIQUE", "INDEX", MatchAny))
-		COMPLETE_WITH_LIST2("CONCURRENTLY", "ON");
+
+	/* Complete ... INDEX [[IF NOT EXISTS] <name>] ON with a list of tables  */
+	else if (TailMatches3("INDEX|CONCURRENTLY", MatchAny, "ON") ||
+			 TailMatches2("INDEX|CONCURRENTLY", "ON") ||
+			 TailMatches6("INDEX|CONCURRENTLY", 
+						  "IF", "NOT", "EXISTS", MatchAny, "ON"))
+		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
 
 	/*
 	 * Complete INDEX <name> ON <table> with a list of table columns (which
 	 * should really be in parens)
 	 */
-	else if (TailMatches4("INDEX", MatchAny, "ON", MatchAny) ||
-			 TailMatches3("INDEX|CONCURRENTLY", "ON", MatchAny))
+	else if (TailMatches3("INDEX|CONCURRENTLY", "ON", MatchAny) ||
+			 TailMatches4("INDEX|CONCURRENTLY", MatchAny, "ON", MatchAny) ||
+			 TailMatches7("INDEX|CONCURRENTLY",
+						  "IF", "NOT", "EXISTS", MatchAny, "ON", MatchAny))
 		COMPLETE_WITH_LIST2("(", "USING");
-	else if (TailMatches5("INDEX", MatchAny, "ON", MatchAny, "(") ||
+	else if (TailMatches5("INDEX|CONCURRENTLY", MatchAny,
+						  "ON", MatchAny, "(") ||
+			 TailMatches8("INDEX|CONCURRENTLY", "IF", "NOT", "EXISTS", MatchAny,
+						  "ON", MatchAny, "(") ||
 			 TailMatches4("INDEX|CONCURRENTLY", "ON", MatchAny, "("))
 		COMPLETE_WITH_ATTR(prev2_wd, "");
 	/* same if you put in USING */
 	else if (TailMatches5("ON", MatchAny, "USING", MatchAny, "("))
 		COMPLETE_WITH_ATTR(prev4_wd, "");
 	/* Complete USING with an index method */
-	else if (TailMatches6("INDEX", MatchAny, MatchAny, "ON", MatchAny, "USING") ||
-			 TailMatches5("INDEX", MatchAny, "ON", MatchAny, "USING") ||
-			 TailMatches4("INDEX", "ON", MatchAny, "USING"))
+	else if (TailMatches5("INDEX|CONCURRENTLY", MatchAny,
+						  "ON", MatchAny, "USING") ||
+			 TailMatches8("INDEX|CONCURRENTLY",
+						  "IF", "NOT", "EXISTS", MatchAny,
+						  "ON", MatchAny, "USING") ||
+			 TailMatches4("INDEX|CONCURRENTLY", "ON", MatchAny, "USING"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_access_methods);
 	else if (TailMatches4("ON", MatchAny, "USING", MatchAny) &&
 			 !TailMatches6("POLICY", MatchAny, MatchAny, MatchAny, MatchAny, MatchAny) &&
-- 
1.8.3.1

>From ac65ecdc92fcae899d13b7b6df51211f6cc7e69d Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Tue, 22 Dec 2015 12:34:13 +0900
Subject: [PATCH 1/2] Fix completion for CREATE INDEX type 2.

This patch introduces multilevel matching for completion. This can
simplify individual matching and make it easier to avoid false
matching.
---
 src/bin/psql/tab-complete.c | 103 ++++++++++++++++++++++++++++----------------
 1 file changed, 65 insertions(+), 38 deletions(-)

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 1a7d184..fb3833b 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -1918,45 +1918,72 @@ psql_completion(const char *text, int start, int end)
 	/* First off we complete CREATE UNIQUE with "INDEX" */
 	else if (TailMatches2("CREATE", "UNIQUE"))
 		COMPLETE_WITH_CONST("INDEX");
-	/* If we have CREATE|UNIQUE INDEX, then add "ON" and existing indexes */
-	else if (TailMatches2("CREATE|UNIQUE", "INDEX"))
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
-								   " UNION SELECT 'ON'"
-								   " UNION SELECT 'CONCURRENTLY'");
-	/* Complete ... INDEX [<name>] ON with a list of tables  */
-	else if (TailMatches3("INDEX", MatchAny, "ON") ||
-			 TailMatches2("INDEX|CONCURRENTLY", "ON"))
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
-	/* If we have CREATE|UNIQUE INDEX <sth> CONCURRENTLY, then add "ON" */
-	else if (TailMatches3("INDEX", MatchAny, "CONCURRENTLY") ||
-			 TailMatches2("INDEX", "CONCURRENTLY"))
-		COMPLETE_WITH_CONST("ON");
-	/* If we have CREATE|UNIQUE INDEX <sth>, then add "ON" or "CONCURRENTLY" */
-	else if (TailMatches3("CREATE|UNIQUE", "INDEX", MatchAny))
-		COMPLETE_WITH_LIST2("CONCURRENTLY", "ON");
 
-	/*
-	 * Complete INDEX <name> ON <table> with a list of table columns (which
-	 * should really be in parens)
-	 */
-	else if (TailMatches4("INDEX", MatchAny, "ON", MatchAny) ||
-			 TailMatches3("INDEX|CONCURRENTLY", "ON", MatchAny))
-		COMPLETE_WITH_LIST2("(", "USING");
-	else if (TailMatches5("INDEX", MatchAny, "ON", MatchAny, "(") ||
-			 TailMatches4("INDEX|CONCURRENTLY", "ON", MatchAny, "("))
-		COMPLETE_WITH_ATTR(prev2_wd, "");
-	/* same if you put in USING */
-	else if (TailMatches5("ON", MatchAny, "USING", MatchAny, "("))
-		COMPLETE_WITH_ATTR(prev4_wd, "");
-	/* Complete USING with an index method */
-	else if (TailMatches6("INDEX", MatchAny, MatchAny, "ON", MatchAny, "USING") ||
-			 TailMatches5("INDEX", MatchAny, "ON", MatchAny, "USING") ||
-			 TailMatches4("INDEX", "ON", MatchAny, "USING"))
-		COMPLETE_WITH_QUERY(Query_for_list_of_access_methods);
-	else if (TailMatches4("ON", MatchAny, "USING", MatchAny) &&
-			 !TailMatches6("POLICY", MatchAny, MatchAny, MatchAny, MatchAny, MatchAny) &&
-			 !TailMatches4("FOR", MatchAny, MatchAny, MatchAny))
-		COMPLETE_WITH_CONST("(");
+	/* Completion for CREATE INDEX */
+	else if (HeadMatches2("CREATE", "UNIQUE|INDEX"))
+	{
+		/* If we have CREATE|UNIQUE INDEX, then add "ON" and existing indexes */
+		if (TailMatches1("INDEX"))
+			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
+									   " UNION SELECT 'ON'"
+									   " UNION SELECT 'IF NOT EXISTS'"
+									   " UNION SELECT 'CONCURRENTLY'");
+		/*
+		 * If we have CREATE [UNIQUE] INDEX [CONCURRENTLY], suggest existing
+		 * indexes or ON/IF NOT EXISTS.
+		 */
+		else if (TailMatches1("CONCURRENTLY"))
+			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
+									   " UNION SELECT 'ON'"
+									   " UNION SELECT 'IF NOT EXISTS'");
+		/*
+		 * If we have CREATE [UNIQUE] INDEX [CONCURRENTLY] IF NOT EXISTS,
+		 * suggest existing indexes
+		 */
+		else if (TailMatches3("IF", "NOT", "EXISTS"))
+			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes, NULL);
+		/*
+		 * If we have CREATE [UNIQUE] INDEX [CONCURRENTLY] [IF NOT EXISTS
+		 * sth], then add "ON"
+		 */
+		else if (TailMatches4("IF", "NOT", "EXISTS", MatchAny) ||
+				 TailMatches2("INDEX|CONCURRENTLY", "!ON"))
+			COMPLETE_WITH_CONST("ON");
+
+		/*
+		 * Complete ... INDEX [[IF NOT EXISTS] <name>] ON with a list of
+		 * tables
+		 */
+		else if (TailMatches3("INDEX|CONCURRENTLY", MatchAny, "ON") ||
+				 TailMatches2("INDEX|CONCURRENTLY", "ON") ||
+				 TailMatches5("IF", "NOT", "EXISTS", MatchAny, "ON"))
+			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
+
+		/*
+		 * Complete INDEX <name> ON <table> with a list of table columns
+		 * (which should really be in parens)
+		 */
+		else if (TailMatches3("INDEX|CONCURRENTLY", "ON", MatchAny) ||
+				 TailMatches4("INDEX|CONCURRENTLY", MatchAny, "ON", MatchAny) ||
+				 TailMatches6("IF", "NOT", "EXISTS", MatchAny, "ON", MatchAny))
+			COMPLETE_WITH_LIST2("(", "USING");
+		else if (TailMatches5("INDEX|CONCURRENTLY", MatchAny,
+							  "ON", MatchAny, "(") ||
+				 TailMatches7("IF", "NOT", "EXISTS", MatchAny,
+							  "ON", MatchAny, "(") ||
+				 TailMatches4("INDEX|CONCURRENTLY", "ON", MatchAny, "("))
+			COMPLETE_WITH_ATTR(prev2_wd, "");
+		/* same if you put in USING */
+		else if (TailMatches5("ON", MatchAny, "USING", MatchAny, "("))
+			COMPLETE_WITH_ATTR(prev4_wd, "");
+		/* Complete USING with an index method */
+		else if (TailMatches3("ON", MatchAny, "USING"))
+			COMPLETE_WITH_QUERY(Query_for_list_of_access_methods);
+		else if (TailMatches4("ON", MatchAny, "USING", MatchAny) &&
+				 !TailMatches6("POLICY", MatchAny, MatchAny, MatchAny, MatchAny, MatchAny) &&
+				 !TailMatches4("FOR", MatchAny, MatchAny, MatchAny))
+			COMPLETE_WITH_CONST("(");
+	} /* CREATE [UNIQUE] INDEX */
 
 	/* CREATE POLICY */
 	/* Complete "CREATE POLICY <name> ON" */
-- 
1.8.3.1

>From d3afe85dded940d67480f305aecb6ab9fb4f9503 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Tue, 22 Dec 2015 12:51:41 +0900
Subject: [PATCH 2/2] Fix tab completion for DROP INDEX

DROP INDEX didn't get suggestions of "CONCURRENTLY", or "IF
EXISTS". This patch introduces such suggestions.
---
 src/bin/psql/tab-complete.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index fb3833b..45bee03 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -2199,7 +2199,7 @@ psql_completion(const char *text, int start, int end)
 /* DROP (when not the previous word) */
 	/* DROP object with CASCADE / RESTRICT */
 	else if (TailMatches3("DROP",
-						  "COLLATION|CONVERSION|DOMAIN|EXTENSION|INDEX|LANGUAGE|SCHEMA|SEQUENCE|SERVER|TABLE|TYPE|VIEW",
+						  "COLLATION|CONVERSION|DOMAIN|EXTENSION|LANGUAGE|SCHEMA|SEQUENCE|SERVER|TABLE|TYPE|VIEW",
 						  MatchAny) ||
 		   (TailMatches4("DROP", "AGGREGATE|FUNCTION", MatchAny, MatchAny) &&
 			ends_with(prev_wd, ')')) ||
@@ -2217,6 +2217,22 @@ psql_completion(const char *text, int start, int end)
 	else if (TailMatches2("DROP", "FOREIGN"))
 		COMPLETE_WITH_LIST2("DATA WRAPPER", "TABLE");
 
+	/* DROP INDEX */
+	else if (HeadMatches2("DROP", "INDEX"))
+	{
+		if (TailMatches1("INDEX"))
+			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
+									   " UNION SELECT 'IF EXISTS'"
+									   " UNION SELECT 'CONCURRENTLY'");
+		else if (TailMatches1("CONCURRENTLY"))
+			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
+									   " UNION SELECT 'IF EXISTS'");
+		else if (TailMatches2("IF", "EXISTS"))
+			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes, NULL);
+		else 
+			COMPLETE_WITH_LIST2("CASCADE", "RESTRICT");
+	}
+
 	/* DROP MATERIALIZED VIEW */
 	else if (TailMatches2("DROP", "MATERIALIZED"))
 		COMPLETE_WITH_CONST("VIEW");
-- 
1.8.3.1