>From a265bd114e77b112488da29a641cefe416c520cf Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Thu, 19 Nov 2015 17:32:34 +0900
Subject: [PATCH 5/7] Merge mergable completions.

Some entries are mergable by regular expressions. This commit merges
such entries.
---
 src/bin/psql/tab-complete.c | 184 +++++++++++---------------------------------
 1 file changed, 46 insertions(+), 138 deletions(-)

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 96073d1..875583c 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -853,15 +853,15 @@ static const pgsql_thing_t words_after_create[] = {
 	{"DATABASE", Query_for_list_of_databases},
 	{"DICTIONARY", Query_for_list_of_ts_dictionaries, NULL, THING_NO_SHOW},
 	{"DOMAIN", NULL, &Query_for_list_of_domains},
-	{"EVENT TRIGGER", NULL, NULL},
+	{"EVENT TRIGGER", Query_for_list_of_event_triggers, NULL},
 	{"EXTENSION", Query_for_list_of_extensions},
-	{"FOREIGN DATA WRAPPER", NULL, NULL},
+	{"FOREIGN DATA WRAPPER", Query_for_list_of_fdws, NULL},
 	{"FOREIGN TABLE", NULL, NULL},
 	{"FUNCTION", NULL, &Query_for_list_of_functions},
 	{"GROUP", Query_for_list_of_roles},
 	{"LANGUAGE", Query_for_list_of_languages},
 	{"INDEX", NULL, &Query_for_list_of_indexes},
-	{"MATERIALIZED VIEW", NULL, NULL},
+	{"MATERIALIZED VIEW", NULL, &Query_for_list_of_matviews},
 	{"OPERATOR", NULL, NULL},	/* Querying for this is probably not such a
 								 * good idea. */
 	{"OWNED", NULL, NULL, THING_NO_CREATE},		/* for DROP OWNED BY ... */
@@ -1130,15 +1130,7 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERGEN);
 	}
 
-	else if (MATCH("ALTER COLLATION #id"))
-	{
-		static const char *const list_ALTERGEN[] =
-		{"OWNER TO", "RENAME TO", "SET SCHEMA", NULL};
-
-		COMPLETE_WITH_LIST(list_ALTERGEN);
-	}
-
-	else if (MATCH("ALTER CONVERSION #id"))
+	else if (MATCH("ALTER {COLLATION|CONVERSION} #id"))
 	{
 		static const char *const list_ALTERGEN[] =
 		{"OWNER TO", "RENAME TO", "SET SCHEMA", NULL};
@@ -1156,9 +1148,7 @@ psql_completion(const char *text, int start, int end)
 	}
 
 	else if (MATCH("ALTER EVENT TRIGGER"))
-	{
 		COMPLETE_WITH_QUERY(Query_for_list_of_event_triggers, NULL);
-	}
 
 	else if (MATCH("ALTER EVENT TRIGGER #id"))
 	{
@@ -1262,10 +1252,8 @@ psql_completion(const char *text, int start, int end)
 	}
 
 	else if (MATCH("ALTER MATERIALIZED VIEW"))
-	{
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_matviews,
 								   "UNION SELECT 'ALL IN TABLESPACE'");
-	}
 
 	else if (MATCH("ALTER {{USER !MAPPING}|{ROLE #id}}"))
 	{
@@ -1386,21 +1374,13 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("ALTER SYSTEM {SET|RESET}"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_alter_system_set_vars, NULL);
 
-	else if (MATCH("ALTER VIEW #id"))
+	else if (MATCH("ALTER{ MATERIALIZED}? VIEW #id"))
 	{
 		static const char *const list_ALTERVIEW[] =
 		{"ALTER COLUMN", "OWNER TO", "RENAME TO", "SET SCHEMA", NULL};
 
 		COMPLETE_WITH_LIST(list_ALTERVIEW);
 	}
-	else if (MATCH("ALTER MATERIALIZED VIEW #id"))
-	{
-		static const char *const list_ALTERMATVIEW[] =
-		{"ALTER COLUMN", "OWNER TO", "RENAME TO", "SET SCHEMA", NULL};
-
-		COMPLETE_WITH_LIST(list_ALTERMATVIEW);
-	}
-
 	else if (MATCH("ALTER POLICY #id"))
 		COMPLETE_WITH_CONST("ON");
 
@@ -1417,28 +1397,19 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("ALTER POLICY #id ON #id TO"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
 
-	else if (MATCH("ALTER POLICY #id ON #id USING"))
+	else if (MATCH("ALTER POLICY #id ON #id {USING|{WITH CHECK}}"))
 		COMPLETE_WITH_CONST("(");
 
-	else if (MATCH("ALTER POLICY #id ON #id WITH CHECK"))
-		COMPLETE_WITH_CONST("(");
-
-	else if (MATCH("ALTER RULE #id"))
+	else if (MATCH("ALTER {RULE|TRIGGER} #id"))
 		COMPLETE_WITH_CONST("ON");
 
 	else if (MATCH("ALTER RULE [#id] ON"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_tables_for_rule, CAPTURE(1));
 
-	else if (MATCH("ALTER RULE #id ON #id"))
-		COMPLETE_WITH_CONST("RENAME TO");
-
-	else if (MATCH("ALTER TRIGGER #id"))
-		COMPLETE_WITH_CONST("ON");
-
 	else if (MATCH("ALTER TRIGGER [#id] ON"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_tables_for_trigger, CAPTURE(1));
 
-	else if (MATCH("ALTER TRIGGER #id ON #id"))
+	else if (MATCH("ALTER {RULE|TRIGGER} #id ON #id"))
 		COMPLETE_WITH_CONST("RENAME TO");
 
 	else if (MATCH("ALTER TABLE #id"))
@@ -1464,22 +1435,13 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERENABLE2);
 	}
-	else if (MATCH("ALTER TABLE [#id] ENABLE RULE"))
-		COMPLETE_WITH_QUERY(Query_for_rule_of_table, CAPTURE(1));
-
-	else if (MATCH("ALTER TABLE [#id] ENABLE #kwd RULE"))
+	else if (MATCH("ALTER TABLE [#id] ENABLE{ {REPLICA|ALWAYS}}? RULE"))
 		COMPLETE_WITH_QUERY(Query_for_rule_of_table, CAPTURE(1));
 
-	else if (MATCH("ALTER TABLE [#id] ENABLE TRIGGER"))
-		COMPLETE_WITH_QUERY(Query_for_trigger_of_table, CAPTURE(1));
-
-	else if (MATCH("ALTER TABLE [#id] ENABLE #kwd TRIGGER"))
+	else if (MATCH("ALTER TABLE [#id] ENABLE{ {REPLICA|ALWAYS}}? TRIGGER"))
 		COMPLETE_WITH_QUERY(Query_for_trigger_of_table, CAPTURE(1));
 
-	else if (MATCH("ALTER TABLE #id INHERIT"))
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, "");
-
-	else if (MATCH("ALTER TABLE #id NO INHERIT"))
+	else if (MATCH("ALTER TABLE #id{ NO}? INHERIT"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, "");
 
 	else if (MATCH("ALTER TABLE #id DISABLE"))
@@ -1495,14 +1457,6 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("ALTER TABLE [#id] DISABLE TRIGGER"))
 		COMPLETE_WITH_QUERY(Query_for_trigger_of_table, CAPTURE(1));
 
-	else if (MATCH("DISABLE ROW LEVEL SECURITY"))
-	{
-		static const char *const list_DISABLERLS[] =
-		{"CASCADE", NULL};
-
-		COMPLETE_WITH_LIST(list_DISABLERLS);
-	}
-
 	else if (MATCH("ALTER TABLE [#id] ALTER"))
 		COMPLETE_WITH_ATTR(CAPTURE(1), " UNION SELECT 'COLUMN' UNION SELECT 'CONSTRAINT'");
 
@@ -1692,7 +1646,8 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("ALTER TEXT SEARCH CONFIGURATION #id"))
 	{
 		static const char *const list_ALTERTEXTSEARCH4[] =
-		{"ADD MAPPING FOR", "ALTER MAPPING", "DROP MAPPING FOR", "OWNER TO", "RENAME TO", "SET SCHEMA", NULL};
+		{"ADD MAPPING FOR", "ALTER MAPPING", "DROP MAPPING FOR",
+		 "OWNER TO", "RENAME TO", "SET SCHEMA", NULL};
 
 		COMPLETE_WITH_LIST(list_ALTERTEXTSEARCH4);
 	}
@@ -1770,23 +1725,17 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_TRANS);
 	}
 /* CLUSTER */
-	else if (MATCH(" !WITHOUT CLUSTER"))
+	else if (MATCH("^CLUSTER"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm,
 								   "UNION SELECT 'VERBOSE'");
 
-	else if (MATCH("CLUSTER VERBOSE"))
+	else if (MATCH("^CLUSTER{ VERBOSE}?"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
 
-	else if (MATCH("CLUSTER !ON|VERBOSE"))
-		COMPLETE_WITH_CONST("USING");
-
-	else if (MATCH("CLUSTER VERBOSE #id"))
+	else if (MATCH("^CLUSTER{ VERBOSE}? #id"))
 		COMPLETE_WITH_CONST("USING");
 
-	else if (MATCH("CLUSTER [#id] USING"))
-		COMPLETE_WITH_QUERY(Query_for_index_of_table, CAPTURE(1));
-
-	else if (MATCH("CLUSTER VERBOSE [#id] USING"))
+	else if (MATCH("^CLUSTER{ VERBOSE}? [#id] USING"))
 		COMPLETE_WITH_QUERY(Query_for_index_of_table, CAPTURE(1));
 
 /* COMMENT */
@@ -1919,37 +1868,29 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("CREATE UNIQUE"))
 		COMPLETE_WITH_CONST("INDEX");
 
-	else if (MATCH("CREATE {UNIQUE }? INDEX #id"))
+	else if (MATCH("CREATE{ UNIQUE}? INDEX"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
 								   " UNION SELECT 'ON'"
 								   " UNION SELECT 'CONCURRENTLY'");
 
-	else if (MATCH("INDEX {CONCURRENTLY }? #id ON"))
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
-
-	else if (MATCH("INDEX #id CONCURRENTLY"))
+	else if (MATCH("INDEX{ CONCURRENTLY}? #id"))
 		COMPLETE_WITH_CONST("ON");
 
-	else if (MATCH("CREATE {UNIQUE }? INDEX #id"))
-	{
-		static const char *const list_CREATE_INDEX[] =
-		{"CONCURRENTLY", "ON", NULL};
-
-		COMPLETE_WITH_LIST(list_CREATE_INDEX);
-	}
+	else if (MATCH("INDEX{ CONCURRENTLY}? #id 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 (MATCH("INDEX #id {CONCURRENTLY }? ON #id"))
+	else if (MATCH("INDEX{ CONCURRENTLY}?{ #id}? ON #id"))
 	{
 		static const char *const list_CREATE_INDEX2[] =
 		{"(", "USING", NULL};
 
 		COMPLETE_WITH_LIST(list_CREATE_INDEX2);
 	}
-	else if (MATCH("INDEX #id {CONCURRENTLY }? ON [#id]("))
+	else if (MATCH("INDEX{ CONCURRENTLY }?{ #id}? ON [#id]("))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
 	else if (MATCH("ON [#id] USING #id("))
@@ -2029,7 +1970,7 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("AS ON #kwd TO"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
 
-	else if (MATCH("CREATE {TEMP{ORARY}? }? SEQUENCE #id"))
+	else if (MATCH("CREATE{ TEMP{ORARY}?}? SEQUENCE #id"))
 	{
 		static const char *const list_CREATESEQUENCE[] =
 		{"INCREMENT BY", "MINVALUE", "MAXVALUE", "NO", "CACHE",
@@ -2037,7 +1978,7 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_CREATESEQUENCE);
 	}
-	else if (MATCH("CREATE {TEMP{ORARY}? }? SEQUENCE #id NO"))
+	else if (MATCH("CREATE{ TEMP{ORARY}?}? SEQUENCE #id NO"))
 	{
 		static const char *const list_CREATESEQUENCE2[] =
 		{"MINVALUE", "MAXVALUE", "CYCLE", NULL};
@@ -2126,7 +2067,7 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("INSTEAD OF #kwd ON"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_views, NULL);
 
-	else if (MATCH("CREATE TRIGGER {#nwb }+ EXECUTE"))
+	else if (MATCH("CREATE TRIGGER{ #nwb}+ EXECUTE"))
 		COMPLETE_WITH_CONST("PROCEDURE");
 
 	else if (MATCH("CREATE {{USER !MAPPING_}|ROLE |GROUP } #id"))
@@ -2495,31 +2436,16 @@ psql_completion(const char *text, int start, int end)
 	 *
 	 * Complete only "GRANT/REVOKE * ON * " with "TO/FROM" here.
 	 */
-	else if (MATCH("[GRANT|REVOKE] #kwd ON !DATABASE|DOMAIN|FUNCTION|LANGUAGE|SCHEMA|SEQUENCE|TABLE|TABLESPACE|TYPE"))
-	{
-		if (pg_strcasecmp(CAPTURE(1), "GRANT") == 0)
-			COMPLETE_WITH_CONST("TO");
-		else
-			COMPLETE_WITH_CONST("FROM");
-	}
-
-	else if (MATCH("[GRANT|REVOKE] #kwd ON ALL #kwd IN SCHEMA #id"))
-	{
-		if (pg_strcasecmp(CAPTURE(1), "GRANT") == 0)
-			COMPLETE_WITH_CONST("TO");
-		else
-			COMPLETE_WITH_CONST("FROM");
-	}
+	else if (MATCH("{GRANT|REVOKE}{ #nwb}+ {TO|FROM}"))
+		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
 
-	else if (MATCH("[GRANT|REVOKE] #kwd ON FOREIGN DATA WRAPPER #id"))
-	{
-		if (pg_strcasecmp(CAPTURE(1), "GRANT") == 0)
-			COMPLETE_WITH_CONST("TO");
-		else
-			COMPLETE_WITH_CONST("FROM");
-	}
+	else if (MATCH("{GRANT|REVOKE} #kwd TO"))
+		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
 
-	else if (MATCH("[GRANT|REVOKE] #kwd ON FOREIGN SERVER #id"))
+	else if (MATCH("[GRANT|REVOKE] #kwd ON !DATABASE|DOMAIN|FOREIGN|FUNCTION|LANGUAGE|SCHEMA|SEQUENCE|TABLE|TABLESPACE|TYPE") ||
+			 MATCH("[GRANT|REVOKE] #kwd ON ALL #kwd IN SCHEMA #id") ||
+			 MATCH("[GRANT|REVOKE] #kwd ON FOREIGN {SERVER|{DATA WRAPPER}} #id") ||
+			 MATCH("[GRANT|REVOKE] #kwd ON #kwd #id"))
 	{
 		if (pg_strcasecmp(CAPTURE(1), "GRANT") == 0)
 			COMPLETE_WITH_CONST("TO");
@@ -2527,21 +2453,6 @@ psql_completion(const char *text, int start, int end)
 			COMPLETE_WITH_CONST("FROM");
 	}
 
-	else if (MATCH("{GRANT|REVOKE}{ #nwb}+ {TO|FROM}"))
-		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
-
-	else if (MATCH("GRANT #kwd ON #kwd #id"))
-		COMPLETE_WITH_CONST("TO");
-
-	else if (MATCH("REVOKE #kwd ON #kwd #id"))
-		COMPLETE_WITH_CONST("FROM");
-
-	else if (MATCH("GRANT #kwd TO"))
-		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
-
-	else if (MATCH("REVOKE #kwd FROM"))
-		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
-
 	else if (MATCH("FROM #id GROUP"))
 		COMPLETE_WITH_CONST("BY");
 
@@ -2638,23 +2549,20 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_CONST("OWNED");
 	else if (MATCH("REASSIGN OWNED"))
 		COMPLETE_WITH_CONST("BY");
-	else if (MATCH("REASSIGN OWNED BY"))
+	else if (MATCH("REASSIGN OWNED BY") ||
+			 MATCH("REASSIGN OWNED BY #id TO"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_roles, NULL);
 	else if (MATCH("REASSIGN OWNED BY #id"))
 		COMPLETE_WITH_CONST("TO");
-	else if (MATCH("REASSIGN OWNED BY #id TO"))
-		COMPLETE_WITH_QUERY(Query_for_list_of_roles, NULL);
 
 /* REFRESH MATERIALIZED VIEW */
 	else if (MATCH("REFRESH"))
 		COMPLETE_WITH_CONST("MATERIALIZED VIEW");
 	else if (MATCH("REFRESH MATERIALIZED"))
 		COMPLETE_WITH_CONST("VIEW");
-	else if (MATCH("REFRESH MATERIALIZED VIEW"))
+	else if (MATCH("REFRESH MATERIALIZED VIEW{ CONCURRENTLY}?"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_matviews,
 								   " UNION SELECT 'CONCURRENTLY'");
-	else if (MATCH("REFRESH MATERIALIZED VIEW CONCURRENTLY"))
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_matviews, NULL);
 	else if (MATCH("REFRESH MATERIALIZED VIEW #id"))
 		COMPLETE_WITH_CONST("WITH");
 	else if (MATCH("REFRESH MATERIALIZED VIEW CONCURRENTLY #id"))
@@ -2909,23 +2817,22 @@ psql_completion(const char *text, int start, int end)
 								   " UNION SELECT 'FREEZE'"
 								   " UNION SELECT 'ANALYZE'"
 								   " UNION SELECT 'VERBOSE'");
-	else if (MATCH("VACUUM {FULL|FREEZE}"))
+	else if (MATCH("VACUUM FULL"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm,
+								   " UNION SELECT 'FREEZE'"
 								   " UNION SELECT 'ANALYZE'"
 								   " UNION SELECT 'VERBOSE'");
-	else if (MATCH("VACUUM {FULL|FREEZE} ANALYZE"))
+	else if (MATCH("VACUUM{ FULL}? FREEZE"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm,
+								   " UNION SELECT 'ANALYZE'"
 								   " UNION SELECT 'VERBOSE'");
-	else if (MATCH("VACUUM {FULL|FREEZE} VERBOSE"))
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm,
-								   " UNION SELECT 'ANALYZE'");
-	else if (MATCH("VACUUM VERBOSE"))
+	else if (MATCH("VACUUM{ FULL}?{ FREEZE}? VERBOSE"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm,
 								   " UNION SELECT 'ANALYZE'");
-	else if (MATCH("VACUUM ANALYZE"))
+	else if (MATCH("VACUUM{ FULL}?{ FREEZE}? ANALYZE"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm,
 								   " UNION SELECT 'VERBOSE'");
-	else if (MATCH("{{VERBOSE ANALYZE}|{ANALYZE VERBOSE}}"))
+	else if (MATCH("VACUUM{ FULL}?{ FREEZE}?{ ANALYZE VERBOSE|VERBOSE ANALYZE}"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
 
 /* WITH [RECURSIVE] */
@@ -3170,7 +3077,8 @@ psql_completion(const char *text, int start, int end)
 	 * check if that was the previous word. If so, execute the query to get a
 	 * list of them.
 	 */
-	else if(MATCH("[#kwd]"))
+	else if(MATCH("[{FOREIGN DATA WRAPPER}|{MATERIALIZED VIEW}|{EVENT TRIGGER}]") ||
+			MATCH("[#kwd]"))
 	{
 		int			i;
 
-- 
1.8.3.1

