sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-03 00:02:26 -04:00
Code Issues Projects Releases Wiki Activity

psql: Improve tab-completion for LOCK TABLE.

Browse Source 
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
This commit is contained in:
Fujii Masao 2021-10-05 10:10:43 +09:00
parent e825943906
commit 0b0d277c35
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/bin/psql/tab-complete.c
View File

@ -3599,40 +3599,49 @@ psql_completion(const char *text, int start, int end)
COMPLETE_WITH("("); COMPLETE_WITH("(");
/* LOCK */ /* LOCK */
/* Complete LOCK [TABLE] with a list of tables */ /* Complete LOCK [TABLE] [ONLY] with a list of tables */
else if (Matches("LOCK")) else if (Matches("LOCK"))
COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables,
" UNION SELECT 'TABLE'"); " UNION SELECT 'TABLE'"
" UNION SELECT 'ONLY'");
else if (Matches("LOCK", "TABLE")) 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 */ /* For the following, handle the case of a single table only for now */
/* Complete LOCK [TABLE] <table> with "IN" */ /* Complete LOCK [TABLE] [ONLY] <table> with IN or NOWAIT */
else if (Matches("LOCK", MatchAnyExcept("TABLE")) || else if (Matches("LOCK", MatchAnyExcept("TABLE|ONLY")) ||
Matches("LOCK", "TABLE", MatchAny)) Matches("LOCK", "TABLE", MatchAnyExcept("ONLY")) ||
COMPLETE_WITH("IN"); 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") || else if (HeadMatches("LOCK") && TailMatches("IN"))
Matches("LOCK", "TABLE", MatchAny, "IN"))
COMPLETE_WITH("ACCESS SHARE MODE", COMPLETE_WITH("ACCESS SHARE MODE",
"ROW SHARE MODE", "ROW EXCLUSIVE MODE", "ROW SHARE MODE", "ROW EXCLUSIVE MODE",
"SHARE UPDATE EXCLUSIVE MODE", "SHARE MODE", "SHARE UPDATE EXCLUSIVE MODE", "SHARE MODE",
"SHARE ROW EXCLUSIVE MODE", "SHARE ROW EXCLUSIVE MODE",
"EXCLUSIVE MODE", "ACCESS 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") || * Complete LOCK [TABLE][ONLY] <table> IN ACCESS|ROW with rest of lock
Matches("LOCK", "TABLE", MatchAny, "IN", "ACCESS|ROW")) * mode
*/
else if (HeadMatches("LOCK") && TailMatches("IN", "ACCESS|ROW"))
COMPLETE_WITH("EXCLUSIVE MODE", "SHARE MODE"); 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") || else if (HeadMatches("LOCK") && TailMatches("IN", "SHARE"))
Matches("LOCK", "TABLE", MatchAny, "IN", "SHARE"))
COMPLETE_WITH("MODE", "ROW EXCLUSIVE MODE", COMPLETE_WITH("MODE", "ROW EXCLUSIVE MODE",
"UPDATE 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 */ /* NOTIFY --- can be inside EXPLAIN, RULE, etc */
else if (TailMatches("NOTIFY")) 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'"); 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'");