Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9d0cf57

Browse files
committed
Add support for GRANT SET in psql tab completion
3d14e17 has added support for this query but psql was not able tocomplete it. Spotted while working on a different patch in the samearea.Reviewed-by: Robert HaasDiscussion:https://postgr.es/m/Y3hw7yvG0VwpC1jq@paquier.xyz
1 parenteae7fe4 commit9d0cf57

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

‎src/bin/psql/tab-complete.c‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3773,7 +3773,7 @@ psql_completion(const char *text, int start, int end)
37733773
*/
37743774
/* Complete GRANT/REVOKE with a list of roles and privileges */
37753775
elseif (TailMatches("GRANT|REVOKE")||
3776-
TailMatches("REVOKE","ADMIN|GRANT|INHERIT","OPTION","FOR"))
3776+
TailMatches("REVOKE","ADMIN|GRANT|INHERIT|SET","OPTION","FOR"))
37773777
{
37783778
/*
37793779
* With ALTER DEFAULT PRIVILEGES, restrict completion to grantable
@@ -3792,18 +3792,21 @@ psql_completion(const char *text, int start, int end)
37923792
Privilege_options_of_grant_and_revoke,
37933793
"GRANT OPTION FOR",
37943794
"ADMIN OPTION FOR",
3795-
"INHERIT OPTION FOR");
3795+
"INHERIT OPTION FOR",
3796+
"SET OPTION FOR");
37963797
elseif (TailMatches("REVOKE","GRANT","OPTION","FOR"))
37973798
COMPLETE_WITH(Privilege_options_of_grant_and_revoke);
3798-
elseif (TailMatches("REVOKE","ADMIN|INHERIT","OPTION","FOR"))
3799+
elseif (TailMatches("REVOKE","ADMIN|INHERIT|SET","OPTION","FOR"))
37993800
COMPLETE_WITH_QUERY(Query_for_list_of_roles);
38003801
}
38013802

38023803
elseif (TailMatches("GRANT|REVOKE","ALTER")||
38033804
TailMatches("REVOKE","GRANT","OPTION","FOR","ALTER"))
38043805
COMPLETE_WITH("SYSTEM");
38053806

3806-
elseif (TailMatches("GRANT|REVOKE","SET")||
3807+
elseif (TailMatches("REVOKE","SET"))
3808+
COMPLETE_WITH("ON PARAMETER","OPTION FOR");
3809+
elseif (TailMatches("GRANT","SET")||
38073810
TailMatches("REVOKE","GRANT","OPTION","FOR","SET")||
38083811
TailMatches("GRANT|REVOKE","ALTER","SYSTEM")||
38093812
TailMatches("REVOKE","GRANT","OPTION","FOR","ALTER","SYSTEM"))
@@ -3942,14 +3945,16 @@ psql_completion(const char *text, int start, int end)
39423945
elseif (HeadMatches("GRANT")&&TailMatches("TO",MatchAny))
39433946
COMPLETE_WITH("WITH ADMIN",
39443947
"WITH INHERIT",
3948+
"WITH SET",
39453949
"WITH GRANT OPTION",
39463950
"GRANTED BY");
39473951
elseif (HeadMatches("GRANT")&&TailMatches("TO",MatchAny,"WITH"))
39483952
COMPLETE_WITH("ADMIN",
39493953
"INHERIT",
3954+
"SET",
39503955
"GRANT OPTION");
39513956
elseif (HeadMatches("GRANT")&&
3952-
(TailMatches("TO",MatchAny,"WITH","ADMIN|INHERIT")))
3957+
(TailMatches("TO",MatchAny,"WITH","ADMIN|INHERIT|SET")))
39533958
COMPLETE_WITH("OPTION","TRUE","FALSE");
39543959
elseif (HeadMatches("GRANT")&&TailMatches("TO",MatchAny,"WITH",MatchAny,"OPTION"))
39553960
COMPLETE_WITH("GRANTED BY");

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp