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.

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 52336aa96d108a36d3a66285161e51734c0dcd17..878d4f0701039c3df833ebb54d050f6af2d8e333 100644 (file)
--- 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");
 
    /*