diff options
| author | Alvaro Herrera | 2016-06-07 21:59:34 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2016-06-07 21:59:34 +0000 |
| commit | 4f04b66f97f0e0265489f0fe0373ea44c9ad11bf (patch) | |
| tree | ca0082bb0011ef27c5f483f5088e2eadadaea4a6 /src/bin/psql/tab-complete.c | |
| parent | 77ba610805e7ef9ba9c9a593ea8b1ca8f98f8bcb (diff) | |
Fix loose ends for SQL ACCESS METHOD objects
COMMENT ON ACCESS METHOD was missing; add it, along psql tab-completion
support for it.
psql was also missing a way to list existing access methods; the new \dA
command does that.
Also add tab-completion support for DROP ACCESS METHOD.
Author: Michael Paquier
Discussion: https://www.postgresql.org/message-id/CAB7nPqTzdZdu8J7EF8SXr_R2U5bSUUYNOT3oAWBZdEoggnwhGA@mail.gmail.com
Diffstat (limited to 'src/bin/psql/tab-complete.c')
| -rw-r--r-- | src/bin/psql/tab-complete.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index a62ffe61e05..3b07726e574 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -1276,7 +1276,7 @@ psql_completion(const char *text, int start, int end) static const char *const backslash_commands[] = { "\\a", "\\connect", "\\conninfo", "\\C", "\\cd", "\\copy", "\\copyright", "\\crosstabview", - "\\d", "\\da", "\\db", "\\dc", "\\dC", "\\dd", "\\ddp", "\\dD", + "\\d", "\\da", "\\dA", "\\db", "\\dc", "\\dC", "\\dd", "\\ddp", "\\dD", "\\des", "\\det", "\\deu", "\\dew", "\\dE", "\\df", "\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL", "\\dm", "\\dn", "\\do", "\\dO", "\\dp", "\\drds", "\\ds", "\\dS", @@ -1910,7 +1910,8 @@ psql_completion(const char *text, int start, int end) else if (Matches2("COMMENT", "ON")) { static const char *const list_COMMENT[] = - {"CAST", "COLLATION", "CONVERSION", "DATABASE", "EVENT TRIGGER", "EXTENSION", + {"ACCESS METHOD", "CAST", "COLLATION", "CONVERSION", "DATABASE", + "EVENT TRIGGER", "EXTENSION", "FOREIGN DATA WRAPPER", "FOREIGN TABLE", "SERVER", "INDEX", "LANGUAGE", "POLICY", "RULE", "SCHEMA", "SEQUENCE", "TABLE", "TYPE", "VIEW", "MATERIALIZED VIEW", "COLUMN", "AGGREGATE", "FUNCTION", @@ -1919,6 +1920,8 @@ psql_completion(const char *text, int start, int end) COMPLETE_WITH_LIST(list_COMMENT); } + else if (Matches4("COMMENT", "ON", "ACCESS", "METHOD")) + COMPLETE_WITH_QUERY(Query_for_list_of_access_methods); else if (Matches3("COMMENT", "ON", "FOREIGN")) COMPLETE_WITH_LIST2("DATA WRAPPER", "TABLE"); else if (Matches4("COMMENT", "ON", "TEXT", "SEARCH")) @@ -2331,6 +2334,12 @@ psql_completion(const char *text, int start, int end) else if (Matches5("DROP", "TRIGGER", MatchAny, "ON", MatchAny)) COMPLETE_WITH_LIST2("CASCADE", "RESTRICT"); + /* DROP ACCESS METHOD */ + else if (Matches2("DROP", "ACCESS")) + COMPLETE_WITH_CONST("METHOD"); + else if (Matches3("DROP", "ACCESS", "METHOD")) + COMPLETE_WITH_QUERY(Query_for_list_of_access_methods); + /* DROP EVENT TRIGGER */ else if (Matches2("DROP", "EVENT")) COMPLETE_WITH_CONST("TRIGGER"); @@ -2931,6 +2940,8 @@ psql_completion(const char *text, int start, int end) } else if (TailMatchesCS1("\\da*")) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_aggregates, NULL); + else if (TailMatchesCS1("\\dA*")) + COMPLETE_WITH_QUERY(Query_for_list_of_access_methods); else if (TailMatchesCS1("\\db*")) COMPLETE_WITH_QUERY(Query_for_list_of_tablespaces); else if (TailMatchesCS1("\\dD*")) |