2021-09-28 17:03 に bt21tanigaway さんは書きました:
2021-09-28 16:36 に Fujii Masao さんは書きました:
On 2021/09/28 16:13, bt21tanigaway wrote:
Hi,
(LOCK TABLE options) “ONLY” and “NOWAIT” are not yet implemented in
tab-complete. I made a patch for these options.
Thanks for the patch!
The patch seems to forget to handle the tab-completion for
"LOCK ONLY <table-name> IN".
Thanks for your comment!
I attach a new patch fixed to this mail.
Regards,
Koyu Tanigawa
Sorry, I forgot to attach patch file.
"fix-tab-complete2.patch" is fixed!
Regards,
Koyu Tanigawa
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 5cd5838668..251b2af9a5 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3599,39 +3599,52 @@ 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'");
+ COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, " 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, "");
/* 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 */
+ /* Complete LOCK [TABLE] [ONLY] <table> IN with a lock mode */
else if (Matches("LOCK", MatchAny, "IN") ||
- Matches("LOCK", "TABLE", MatchAny, "IN"))
+ Matches("LOCK", "TABLE", MatchAny, "IN") ||
+ Matches("LOCK", "ONLY", MatchAny, "IN") ||
+ Matches("LOCK", "TABLE", "ONLY", MatchAny, "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 */
+ /* Complete LOCK [TABLE][ONLY] <table> IN ACCESS|ROW with rest of lock mode */
else if (Matches("LOCK", MatchAny, "IN", "ACCESS|ROW") ||
- Matches("LOCK", "TABLE", MatchAny, "IN", "ACCESS|ROW"))
+ Matches("LOCK", "TABLE", MatchAny, "IN", "ACCESS|ROW") ||
+ Matches("LOCK", "ONLY", MatchAny, "IN", "ACCESS|ROW") ||
+ Matches("LOCK", "TABLE", "ONLY", MatchAny, "IN", "ACCESS|ROW"))
COMPLETE_WITH("EXCLUSIVE MODE", "SHARE MODE");
- /* Complete LOCK [TABLE] <table> IN SHARE with rest of lock mode */
+ /* Complete LOCK [TABLE] [ONLY] <table> IN SHARE with rest of lock mode */
else if (Matches("LOCK", MatchAny, "IN", "SHARE") ||
- Matches("LOCK", "TABLE", MatchAny, "IN", "SHARE"))
- COMPLETE_WITH("MODE", "ROW EXCLUSIVE MODE",
- "UPDATE EXCLUSIVE MODE");
+ Matches("LOCK", "TABLE", MatchAny, "IN", "SHARE") ||
+ Matches("LOCK", "ONLY", MatchAny, "IN", "SHARE") ||
+ Matches("LOCK", "TABLE", "ONLY", MatchAny, "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"))
