rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify tab completion of extension versions. 

Second thoughts about 9cd43f6cb: given that we're staying bug-compatible
with the old behavior of using double not single quotes for extension
versions, we can simplify this completion code by pretending that
extension versions *are* identifiers, and not using VERBATIM.  Then
_complete_from_query() will think that the query results are identifiers
in need of quoting, and we end up with the same behavior as before.

This doesn't work for Query_for_list_of_available_extension_versions_with_TO,
but let's just drop that: there is no other place where we handle
multi-keyword phrases that way, and it doesn't seem very desirable here
either.  Handle completion of "UPDATE TO" in our more usual pattern.

Discussion: https://postgr.es/m/CAMkU=1yV+egSYrzWvbDY8VZ6bKEMrKbzxr-HTuiHi+wDgSUMgA@mail.gmail.com
This commit is contained in:
Tom Lane 2022-06-21 12:04:11 -04:00
parent 75bfe7434d
commit 662dbe2c86
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,10 +239,12 @@ static bool completion_force_quote; /* true to force-quote filenames */
* 4) The list of attributes of the given table (possibly schema-qualified).
* 5) The list of arguments to the given function (possibly schema-qualified).
*
* The query is generally expected to return raw SQL identifiers; quoting
* is handled by the matching machinery. If what is returned is not SQL
* identifiers, use one of the VERBATIM forms (and then, if quoting is
* needed, do it inside the query).
* The query is generally expected to return raw SQL identifiers; matching
* to what the user typed is done in a quoting-aware fashion. If what is
* returned is not SQL identifiers, use one of the VERBATIM forms, in which
* case the query results are matched to the user's text without double-quote
* processing (so if quoting is needed, you must provide it in the query
* results).
*/
#define COMPLETE_WITH_QUERY(query) \
COMPLETE_WITH_QUERY_LIST(query, NULL)
@ -1081,19 +1083,10 @@ static const SchemaQuery Query_for_trigger_of_table = {
" FROM pg_catalog.pg_available_extensions "\
" WHERE name LIKE '%s' AND installed_version IS NULL"
/* the result of this query is not a raw identifier, so use VERBATIM */
#define Query_for_list_of_available_extension_versions \
" SELECT pg_catalog.quote_ident(version) "\
" SELECT version "\
" FROM pg_catalog.pg_available_extension_versions "\
" WHERE pg_catalog.quote_ident(version) LIKE '%s'"\
" AND name='%s'"
/* the result of this query is not a raw identifier, so use VERBATIM */
#define Query_for_list_of_available_extension_versions_with_TO \
" SELECT 'TO ' || pg_catalog.quote_ident(version) "\
" FROM pg_catalog.pg_available_extension_versions "\
" WHERE ('TO ' || pg_catalog.quote_ident(version)) LIKE '%s'"\
" AND name='%s'"
" WHERE version LIKE '%s' AND name='%s'"
#define Query_for_list_of_prepared_statements \
" SELECT name "\
@ -1934,20 +1927,17 @@ psql_completion(const char *text, int start, int end)
/* ALTER EXTENSION <name> */
else if (Matches("ALTER", "EXTENSION", MatchAny))
COMPLETE_WITH("ADD", "DROP", "UPDATE", "SET SCHEMA");
COMPLETE_WITH("ADD", "DROP", "UPDATE TO", "SET SCHEMA");
/* ALTER EXTENSION <name> UPDATE */
else if (Matches("ALTER", "EXTENSION", MatchAny, "UPDATE"))
{
set_completion_reference(prev2_wd);
COMPLETE_WITH_QUERY_VERBATIM(Query_for_list_of_available_extension_versions_with_TO);
}
COMPLETE_WITH("TO");
/* ALTER EXTENSION <name> UPDATE TO */
else if (Matches("ALTER", "EXTENSION", MatchAny, "UPDATE", "TO"))
{
set_completion_reference(prev3_wd);
COMPLETE_WITH_QUERY_VERBATIM(Query_for_list_of_available_extension_versions);
COMPLETE_WITH_QUERY(Query_for_list_of_available_extension_versions);
}
/* ALTER FOREIGN */
@ -2824,7 +2814,7 @@ psql_completion(const char *text, int start, int end)
else if (Matches("CREATE", "EXTENSION", MatchAny, "VERSION"))
{
set_completion_reference(prev2_wd);
COMPLETE_WITH_QUERY_VERBATIM(Query_for_list_of_available_extension_versions);
COMPLETE_WITH_QUERY(Query_for_list_of_available_extension_versions);
}
/* CREATE FOREIGN */