From 265774a83e1aeea1841920569fec4c9b2cd9ba2b Mon Sep 17 00:00:00 2001 From: Haiying Tang Date: Thu, 1 Apr 2021 18:23:54 +0900 Subject: [PATCH] Support tab completion with a query result for upper character inputs in psql diff --git a/src/bin/psql/t/010_tab_completion.pl b/src/bin/psql/t/010_tab_completion.pl index c27f216d39..e04600d51f 100644 --- a/src/bin/psql/t/010_tab_completion.pl +++ b/src/bin/psql/t/010_tab_completion.pl @@ -142,6 +142,16 @@ check_completion("SEL\t", qr/SELECT /, "complete SEL to SELECT"); clear_query(); +# check basic query command completion for upper character inputs +check_completion("set BYT\t", qr/set BYTEA_OUTPUT /, "complete set BYT to set BYTEA_OUTPUT"); + +clear_query(); + +# check query command completion for upper character ralation name +check_completion("update TAB1 SET \t", qr/update TAB1 SET \af/, "complete column name for TAB1"); + +clear_query(); + # check case variation is honored check_completion("sel\t", qr/select /, "complete sel to select"); diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index a053bc1e45..8078b30452 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -197,18 +197,21 @@ static bool completion_force_quote; /* true to force-quote filenames */ */ #define COMPLETE_WITH_QUERY(query) \ do { \ + completion_case_sensitive = false; \ completion_charp = query; \ matches = rl_completion_matches(text, complete_from_query); \ } while (0) #define COMPLETE_WITH_VERSIONED_QUERY(query) \ do { \ + completion_case_sensitive = false; \ completion_vquery = query; \ matches = rl_completion_matches(text, complete_from_versioned_query); \ } while (0) #define COMPLETE_WITH_SCHEMA_QUERY(query, addon) \ do { \ + completion_case_sensitive = false; \ completion_squery = &(query); \ completion_charp = addon; \ matches = rl_completion_matches(text, complete_from_schema_query); \ @@ -216,6 +219,7 @@ do { \ #define COMPLETE_WITH_VERSIONED_SCHEMA_QUERY(query, addon) \ do { \ + completion_case_sensitive = false; \ completion_squery = query; \ completion_vquery = addon; \ matches = rl_completion_matches(text, complete_from_versioned_schema_query); \ @@ -1016,7 +1020,7 @@ static const VersionedQuery Query_for_list_of_subscriptions[] = { }; /* - * This is a list of all "things" in Pgsql, which can show up after CREATE or + * This is a list of all "things" in pgsql, which can show up after CREATE or * DROP; and there is also a query to get a list of them. */ @@ -1166,6 +1170,7 @@ static char *complete_from_files(const char *text, int state); static char *pg_strdup_keyword_case(const char *s, const char *ref); static char *escape_string(const char *text); +static char *pg_string_tolower(const char *text); static PGresult *exec_query(const char *query); static char **get_previous_words(int point, char **buffer, int *nwords); @@ -4401,16 +4406,18 @@ _complete_from_query(const char *simple_query, PQclear(result); result = NULL; - /* Set up suitably-escaped copies of textual inputs */ - e_text = escape_string(text); + /* Set up suitably-escaped copies of textual inputs, + * then change the textual inputs to lower case. + */ + e_text = pg_string_tolower(escape_string(text)); if (completion_info_charp) - e_info_charp = escape_string(completion_info_charp); + e_info_charp = pg_string_tolower(escape_string(completion_info_charp)); else e_info_charp = NULL; if (completion_info_charp2) - e_info_charp2 = escape_string(completion_info_charp2); + e_info_charp2 = pg_string_tolower(escape_string(completion_info_charp2)); else e_info_charp2 = NULL; @@ -4445,7 +4452,7 @@ _complete_from_query(const char *simple_query, */ if (strcmp(schema_query->catname, "pg_catalog.pg_class c") == 0 && - strncmp(text, "pg_", 3) != 0) + strncmp(pg_string_tolower(text), "pg_", 3) != 0) { appendPQExpBufferStr(&query_buffer, " AND c.relnamespace <> (SELECT oid FROM" @@ -4537,7 +4544,17 @@ _complete_from_query(const char *simple_query, while (list_index < PQntuples(result) && (item = PQgetvalue(result, list_index++, 0))) if (pg_strncasecmp(text, item, byte_length) == 0) - return pg_strdup(item); + { + if (byte_length == 0 || completion_case_sensitive) + return pg_strdup(item); + else + /* + * If case insensitive matching was requested initially, + * adjust the case according to setting. + */ + return pg_strdup_keyword_case(item, text); + } + } /* If nothing matches, free the db structure and return null */ @@ -4588,7 +4605,6 @@ complete_from_list(const char *text, int state) if (completion_case_sensitive) return pg_strdup(item); else - /* * If case insensitive matching was requested initially, * adjust the case according to setting. @@ -4641,7 +4657,6 @@ complete_from_const(const char *text, int state) if (completion_case_sensitive) return pg_strdup(completion_charp); else - /* * If case insensitive matching was requested initially, adjust * the case according to setting. @@ -4874,6 +4889,24 @@ escape_string(const char *text) } +/* + * pg_string_tolower - Fold a string to lower case. + */ +static char * +pg_string_tolower(const char *text) +{ + char *ret, + *p; + + ret = pg_strdup(text); + + for (p = ret; *p; p++) + *p = pg_tolower((unsigned char) *p); + + return ret; +} + + /* * Execute a query and report any errors. This should be the preferred way of * talking to the database in this file. -- 2.30.0.windows.2