database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-09 06:21:09 +03:00
Code Activity

psql: Fix tab-completion after GRANT/REVOKE on LARGE OBJECT and FOREIGN SERVER.

Browse Source 
Previously, when pressing Tab after GRANT or REVOKE ... ON LARGE OBJECT
or ON FOREIGN SERVER, TO or FROM was incorrectly suggested by psql's
tab-completion. This was not appropriate, as those clauses are not valid
at that point.

This commit fixes the issue by preventing TO and FROM from being offered
immediately after those specific GRANT/REVOKE statements.

Author: Yugo Nagata <nagata@sraoss.co.jp>
Reviewed-by: Fujii Masao <masao.fujii@gmail.com>
Discussion: https://postgr.es/m/20250408122857.b2b06dde4e6a08290af02336@sraoss.co.jp
This commit is contained in:
Fujii Masao
2025-07-15 18:51:17 +09:00
parent 006fc975a2
commit ff0bcb248e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/psql/tab-complete.in.c
View File

@@ -4619,10 +4619,14 @@ match_previous_words(int pattern_id,
else if (Matches("ALTER", "DEFAULT", "PRIVILEGES", MatchAnyN, "TO", MatchAny)) else if (Matches("ALTER", "DEFAULT", "PRIVILEGES", MatchAnyN, "TO", MatchAny))
COMPLETE_WITH("WITH GRANT OPTION"); COMPLETE_WITH("WITH GRANT OPTION");
/* Complete "GRANT/REVOKE ... ON * *" with TO/FROM */ /* Complete "GRANT/REVOKE ... ON * *" with TO/FROM */
else if (Matches("GRANT", MatchAnyN, "ON", MatchAny, MatchAny)) else if (Matches("GRANT|REVOKE", MatchAnyN, "ON", MatchAny, MatchAny) &&
!TailMatches("FOREIGN", "SERVER") && !TailMatches("LARGE", "OBJECT"))
{
if (Matches("GRANT", MatchAnyN, "ON", MatchAny, MatchAny))
COMPLETE_WITH("TO"); COMPLETE_WITH("TO");
else if (Matches("REVOKE", MatchAnyN, "ON", MatchAny, MatchAny)) else
COMPLETE_WITH("FROM"); COMPLETE_WITH("FROM");
}
/* Complete "GRANT/REVOKE * ON ALL * IN SCHEMA *" with TO/FROM */ /* Complete "GRANT/REVOKE * ON ALL * IN SCHEMA *" with TO/FROM */
else if (TailMatches("GRANT|REVOKE", MatchAny, "ON", "ALL", MatchAny, "IN", "SCHEMA", MatchAny) || else if (TailMatches("GRANT|REVOKE", MatchAny, "ON", "ALL", MatchAny, "IN", "SCHEMA", MatchAny) ||