From b1bfb28b586a319052d96dd4dfd40a05505ea6ed Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 12 Jan 2016 20:31:43 -0500 Subject: [PATCH] psql: Improve CREATE INDEX CONCURRENTLY tab completion The completion of CREATE INDEX CONCURRENTLY was lacking in several ways compared to a plain CREATE INDEX command: - CREATE INDEX ON completes table names, but didn't with CONCURRENTLY. - CREATE INDEX completes ON and existing index names, but with CONCURRENTLY it only completed ON. - CREATE INDEX completes ON, but didn't with CONCURRENTLY. These are now all fixed. --- src/bin/psql/tab-complete.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 52336aa96d..878d4f0701 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -2005,15 +2005,17 @@ psql_completion(const char *text, int start, int end) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes, " UNION SELECT 'ON'" " UNION SELECT 'CONCURRENTLY'"); - /* Complete ... INDEX [] ON with a list of tables */ - else if (TailMatches3("INDEX", MatchAny, "ON") || + /* Complete ... INDEX|CONCURRENTLY [] ON with a list of tables */ + else if (TailMatches3("INDEX|CONCURRENTLY", MatchAny, "ON") || TailMatches2("INDEX|CONCURRENTLY", "ON")) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL); - /* If we have CREATE|UNIQUE INDEX CONCURRENTLY, then add "ON" */ + /* Complete ... INDEX CONCURRENTLY with "ON" and existing indexes */ else if (TailMatches2("INDEX", "CONCURRENTLY")) - COMPLETE_WITH_CONST("ON"); - /* If we have CREATE|UNIQUE INDEX , then add "ON" */ - else if (TailMatches3("CREATE|UNIQUE", "INDEX", MatchAny)) + COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes, + " UNION SELECT 'ON'"); + /* Complete CREATE|UNIQUE INDEX [CONCURRENTLY] with "ON" */ + else if (TailMatches3("CREATE|UNIQUE", "INDEX", MatchAny) || + TailMatches4("CREATE|UNIQUE", "INDEX", "CONCURRENTLY", MatchAny)) COMPLETE_WITH_CONST("ON"); /*