psql: Improve tab-completion for LOCK TABLE.

This commit makes psql support the tab-completion for ONLY and
NOWAIT keywords of LOCK TABLE command.

Author: Koyu Tanigawa
Reviewed-by: Shinya Kato, Fujii Masao
Discussion: https://postgr.es/m/a322684daa36319e6ebc60b541000a3a@oss.nttdata.com

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 5cd583866896f55d64bdd3f1715950196a6d54f6..ecae9df8edaec1dc6719066730c8f216a37846cc 100644 (file)
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3599,40 +3599,49 @@ psql_completion(const char *text, int start, int end)
                COMPLETE_WITH("(");
 
 /* LOCK */
-       /* Complete LOCK [TABLE] with a list of tables */
+       /* Complete LOCK [TABLE] [ONLY] with a list of tables */
        else if (Matches("LOCK"))
                COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables,
-                                                                  " UNION SELECT 'TABLE'");
+                                                                  " UNION SELECT 'TABLE'"
+                                                                  " UNION SELECT 'ONLY'");
        else if (Matches("LOCK", "TABLE"))
-               COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, "");
-
+               COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables,
+                                                                  " UNION SELECT 'ONLY'");
+       else if (Matches("LOCK", "TABLE", "ONLY") || Matches("LOCK", "ONLY"))
+               COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
        /* For the following, handle the case of a single table only for now */
 
-       /* Complete LOCK [TABLE] <table> with "IN" */
-       else if (Matches("LOCK", MatchAnyExcept("TABLE")) ||
-                        Matches("LOCK", "TABLE", MatchAny))
-               COMPLETE_WITH("IN");
+       /* Complete LOCK [TABLE] [ONLY] <table> with IN or NOWAIT */
+       else if (Matches("LOCK", MatchAnyExcept("TABLE|ONLY")) ||
+                        Matches("LOCK", "TABLE", MatchAnyExcept("ONLY")) ||
+                        Matches("LOCK", "ONLY", MatchAny) ||
+                        Matches("LOCK", "TABLE", "ONLY", MatchAny))
+               COMPLETE_WITH("IN", "NOWAIT");
 
-       /* Complete LOCK [TABLE] <table> IN with a lock mode */
-       else if (Matches("LOCK", MatchAny, "IN") ||
-                        Matches("LOCK", "TABLE", MatchAny, "IN"))
+       /* Complete LOCK [TABLE] [ONLY] <table> IN with a lock mode */
+       else if (HeadMatches("LOCK") && TailMatches("IN"))
                COMPLETE_WITH("ACCESS SHARE MODE",
                                          "ROW SHARE MODE", "ROW EXCLUSIVE MODE",
                                          "SHARE UPDATE EXCLUSIVE MODE", "SHARE MODE",
                                          "SHARE ROW EXCLUSIVE MODE",
                                          "EXCLUSIVE MODE", "ACCESS EXCLUSIVE MODE");
 
-       /* Complete LOCK [TABLE] <table> IN ACCESS|ROW with rest of lock mode */
-       else if (Matches("LOCK", MatchAny, "IN", "ACCESS|ROW") ||
-                        Matches("LOCK", "TABLE", MatchAny, "IN", "ACCESS|ROW"))
+       /*
+        * Complete LOCK [TABLE][ONLY] <table> IN ACCESS|ROW with rest of lock
+        * mode
+        */
+       else if (HeadMatches("LOCK") && TailMatches("IN", "ACCESS|ROW"))
                COMPLETE_WITH("EXCLUSIVE MODE", "SHARE MODE");
 
-       /* Complete LOCK [TABLE] <table> IN SHARE with rest of lock mode */
-       else if (Matches("LOCK", MatchAny, "IN", "SHARE") ||
-                        Matches("LOCK", "TABLE", MatchAny, "IN", "SHARE"))
+       /* Complete LOCK [TABLE] [ONLY] <table> IN SHARE with rest of lock mode */
+       else if (HeadMatches("LOCK") && TailMatches("IN", "SHARE"))
                COMPLETE_WITH("MODE", "ROW EXCLUSIVE MODE",
                                          "UPDATE EXCLUSIVE MODE");
 
+       /* Complete LOCK [TABLE] [ONLY] <table> [IN lockmode MODE] with "NOWAIT" */
+       else if (HeadMatches("LOCK") && TailMatches("MODE"))
+               COMPLETE_WITH("NOWAIT");
+
 /* NOTIFY --- can be inside EXPLAIN, RULE, etc */
        else if (TailMatches("NOTIFY"))
                COMPLETE_WITH_QUERY("SELECT pg_catalog.quote_ident(channel) FROM pg_catalog.pg_listening_channels() AS channel WHERE substring(pg_catalog.quote_ident(channel),1,%d)='%s'");