database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Improve psql tab completion for various DROP commands

Browse Source 
The following improvements are done:
- Handling of RESTRICT/CASCADE for DROP OWNED, matviews and policies.
- Handling of DROP TRANSFORM

This is a continuation of the work done in 0cd6d3b and f44ceb4.

Author: Ken Kato
Reviewed-by: Asif Rehman
Discussion: https://postgr.es/m/0fafb73f3a0c6bcec817a25ca9d5a853@oss.nttdata.com
This commit is contained in:
Michael Paquier
2021-12-01 10:50:51 +09:00
parent 538724fc36
commit 9270778f46
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3322,12 +3322,16 @@ psql_completion(const char *text, int start, int end)
COMPLETE_WITH("VIEW"); COMPLETE_WITH("VIEW");
else if (Matches("DROP", "MATERIALIZED", "VIEW")) else if (Matches("DROP", "MATERIALIZED", "VIEW"))
COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_matviews, NULL); COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_matviews, NULL);
else if (Matches("DROP", "MATERIALIZED", "VIEW", MatchAny))
COMPLETE_WITH("CASCADE", "RESTRICT");
/* DROP OWNED BY */ /* DROP OWNED BY */
else if (Matches("DROP", "OWNED")) else if (Matches("DROP", "OWNED"))
COMPLETE_WITH("BY"); COMPLETE_WITH("BY");
else if (Matches("DROP", "OWNED", "BY")) else if (Matches("DROP", "OWNED", "BY"))
COMPLETE_WITH_QUERY(Query_for_list_of_roles); COMPLETE_WITH_QUERY(Query_for_list_of_roles);
else if (Matches("DROP", "OWNED", "BY", MatchAny))
COMPLETE_WITH("CASCADE", "RESTRICT");
/* DROP TEXT SEARCH */ /* DROP TEXT SEARCH */
else if (Matches("DROP", "TEXT", "SEARCH")) else if (Matches("DROP", "TEXT", "SEARCH"))
@ -3368,6 +3372,8 @@ psql_completion(const char *text, int start, int end)
completion_info_charp = prev2_wd; completion_info_charp = prev2_wd;
COMPLETE_WITH_QUERY(Query_for_list_of_tables_for_policy); COMPLETE_WITH_QUERY(Query_for_list_of_tables_for_policy);
} }
else if (Matches("DROP", "POLICY", MatchAny, "ON", MatchAny))
COMPLETE_WITH("CASCADE", "RESTRICT");
/* DROP RULE */ /* DROP RULE */
else if (Matches("DROP", "RULE", MatchAny)) else if (Matches("DROP", "RULE", MatchAny))
@ -3380,6 +3386,21 @@ psql_completion(const char *text, int start, int end)
else if (Matches("DROP", "RULE", MatchAny, "ON", MatchAny)) else if (Matches("DROP", "RULE", MatchAny, "ON", MatchAny))
COMPLETE_WITH("CASCADE", "RESTRICT"); COMPLETE_WITH("CASCADE", "RESTRICT");
/* DROP TRANSFORM */
else if (Matches("DROP", "TRANSFORM"))
COMPLETE_WITH("FOR");
else if (Matches("DROP", "TRANSFORM", "FOR"))
COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_datatypes, NULL);
else if (Matches("DROP", "TRANSFORM", "FOR", MatchAny))
COMPLETE_WITH("LANGUAGE");
else if (Matches("DROP", "TRANSFORM", "FOR", MatchAny, "LANGUAGE"))
{
completion_info_charp = prev2_wd;
COMPLETE_WITH_QUERY(Query_for_list_of_languages);
}
else if (Matches("DROP", "TRANSFORM", "FOR", MatchAny, "LANGUAGE", MatchAny))
COMPLETE_WITH("CASCADE", "RESTRICT");
/* EXECUTE */ /* EXECUTE */
else if (Matches("EXECUTE")) else if (Matches("EXECUTE"))
COMPLETE_WITH_QUERY(Query_for_list_of_prepared_statements); COMPLETE_WITH_QUERY(Query_for_list_of_prepared_statements);