From 6b80668783dca415932b1d8674c9e5fa7c6a3547 Mon Sep 17 00:00:00 2001 From: xianbinzhu Date: Sun, 29 Mar 2026 14:55:48 +0800 Subject: [PATCH] psql: complete ALTER ROLE ... IN DATABASE ... RESET Signed-off-by: xianbinzhu --- src/bin/psql/t/010_tab_completion.pl | 12 ++++++++++++ src/bin/psql/tab-complete.in.c | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/bin/psql/t/010_tab_completion.pl b/src/bin/psql/t/010_tab_completion.pl index 1d2e5f5b92a..5e7b956a012 100644 --- a/src/bin/psql/t/010_tab_completion.pl +++ b/src/bin/psql/t/010_tab_completion.pl @@ -44,6 +44,7 @@ $node->safe_psql('postgres', . "CREATE TABLE mytab246 (f1 int, f2 text);\n" . "CREATE TABLE \"mixedName\" (f1 int, f2 text);\n" . "CREATE TYPE enum1 AS ENUM ('foo', 'bar', 'baz', 'BLACK');\n" + . "CREATE ROLE tabcomp_role;\n" . "CREATE PUBLICATION some_publication;\n"); # In a VPATH build, we'll be started in the source directory, but we want @@ -228,6 +229,17 @@ check_completion( clear_query(); +check_completion( + "ALTER ROLE tabcomp_role IN DATABASE post\t", + qr/postgres /, + "complete database name for ALTER ROLE ... IN DATABASE"); +check_completion( + "RESET clie\t", + qr/client_encoding /, + "complete GUC for ALTER ROLE ... IN DATABASE ... RESET"); + +clear_query(); + # check variant where we're completing a qualified name from a refname # (this one also checks successful completion in a multiline command) check_completion( diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c index 523d3f39fc5..33728eda55c 100644 --- a/src/bin/psql/tab-complete.in.c +++ b/src/bin/psql/tab-complete.in.c @@ -2575,7 +2575,9 @@ match_previous_words(int pattern_id, /* ALTER USER,ROLE IN DATABASE SET */ else if (Matches("ALTER", "USER|ROLE", MatchAny, "IN", "DATABASE", MatchAny, "SET")) COMPLETE_WITH_QUERY(Query_for_list_of_set_vars); - /* XXX missing support for ALTER ROLE IN DATABASE RESET */ + /* ALTER USER,ROLE IN DATABASE RESET */ + else if (Matches("ALTER", "USER|ROLE", MatchAny, "IN", "DATABASE", MatchAny, "RESET")) + COMPLETE_WITH_QUERY_PLUS(Query_for_list_of_set_vars, "ALL"); /* ALTER USER,ROLE RESET */ else if (Matches("ALTER", "USER|ROLE", MatchAny, "RESET")) { base-commit: 10e4d8aaf46fb46b8b78e026560b68af84a6495b -- 2.50.1 (Apple Git-155)