database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-01 01:04:50 +03:00
Code

psql: handle tab completion of timezone names after "SET TIMEZONE TO".

Browse Source 
Dagfinn Ilmari Mannsåker and Tom Lane

Discussion: https://postgr.es/m/87k0curq0w.fsf@wibble.ilmari.org
This commit is contained in:
Tom Lane 2022-03-20 16:06:41 -04:00
parent ba9a7e3921
commit 7fa3db3679
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/psql/t/010_tab_completion.pl
View File

@ -338,6 +338,19 @@ check_completion(
clear_line(); clear_line();
# check timezone name completion
check_completion(
"SET timezone TO am\t",
qr|'America/|,
"offer partial timezone name");
check_completion(
"new_\t",
qr|New_York|,
"complete partial timezone name");
clear_line();
# check completion of a keyword offered in addition to object names; # check completion of a keyword offered in addition to object names;
# such a keyword should obey COMP_KEYWORD_CASE # such a keyword should obey COMP_KEYWORD_CASE
foreach ( foreach (

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

@ -402,6 +402,24 @@ do { \
matches = rl_completion_matches(text, complete_from_schema_query); \ matches = rl_completion_matches(text, complete_from_schema_query); \
} while (0) } while (0)
/*
* Timezone completion is mostly like enum label completion, but we work
* a little harder since this is a more common use-case.
*/
#define COMPLETE_WITH_TIMEZONE_NAME() \
do { \
static const char *const list[] = { "DEFAULT", NULL }; \
if (text[0] == '\'') \
completion_charp = Query_for_list_of_timezone_names_quoted_in; \
else if (start == 0 || rl_line_buffer[start - 1] != '\'') \
completion_charp = Query_for_list_of_timezone_names_quoted_out; \
else \
completion_charp = Query_for_list_of_timezone_names_unquoted; \
completion_charpp = list; \
completion_verbatim = true; \
matches = rl_completion_matches(text, complete_from_query); \
} while (0)
#define COMPLETE_WITH_FUNCTION_ARG(function) \ #define COMPLETE_WITH_FUNCTION_ARG(function) \
do { \ do { \
set_completion_reference(function); \ set_completion_reference(function); \
@ -1105,6 +1123,21 @@ static const SchemaQuery Query_for_trigger_of_table = {
" FROM pg_catalog.pg_cursors "\ " FROM pg_catalog.pg_cursors "\
" WHERE name LIKE '%s'" " WHERE name LIKE '%s'"
#define Query_for_list_of_timezone_names_unquoted \
" SELECT name "\
" FROM pg_catalog.pg_timezone_names() "\
" WHERE pg_catalog.lower(name) LIKE pg_catalog.lower('%s')"
#define Query_for_list_of_timezone_names_quoted_out \
"SELECT pg_catalog.quote_literal(name) AS name "\
" FROM pg_catalog.pg_timezone_names() "\
" WHERE pg_catalog.lower(name) LIKE pg_catalog.lower('%s')"
#define Query_for_list_of_timezone_names_quoted_in \
"SELECT pg_catalog.quote_literal(name) AS name "\
" FROM pg_catalog.pg_timezone_names() "\
" WHERE pg_catalog.quote_literal(pg_catalog.lower(name)) LIKE pg_catalog.lower('%s')"
/* /*
* These object types were introduced later than our support cutoff of * These object types were introduced later than our support cutoff of
* server version 9.2. We use the VersionedQuery infrastructure so that * server version 9.2. We use the VersionedQuery infrastructure so that
@ -4176,6 +4209,8 @@ psql_completion(const char *text, int start, int end)
" AND nspname NOT LIKE E'pg\\\\_temp%%'", " AND nspname NOT LIKE E'pg\\\\_temp%%'",
"DEFAULT"); "DEFAULT");
} }
else if (TailMatches("TimeZone", "TO|="))
COMPLETE_WITH_TIMEZONE_NAME();
else else
{ {
/* generic, type based, GUC support */ /* generic, type based, GUC support */