From b2c1fac6ec41ec52d96628294c2d1c7f5c1191f3 Mon Sep 17 00:00:00 2001 From: alterego655 <824662526@qq.com> Date: Tue, 16 Dec 2025 11:00:25 +0800 Subject: [PATCH v11 3/4] Add tab completion for WAIT FOR LSN MODE option Update psql tab completion to support the optional MODE option in WAIT FOR LSN command. After specifying an LSN value, completion now offers both MODE and WITH keywords. The MODE option controls whether the wait is evaluated from the standby or primary perspective. When MODE is specified, completion suggests the valid mode values: standby_replay, standby_write, standby_flush, and primary_flush. --- src/bin/psql/tab-complete.in.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c index 75a101c6ab5..62d87561169 100644 --- a/src/bin/psql/tab-complete.in.c +++ b/src/bin/psql/tab-complete.in.c @@ -5355,8 +5355,10 @@ match_previous_words(int pattern_id, /* * WAIT FOR LSN '' [ WITH ( option [, ...] ) ] * where option can be: + * MODE '' * TIMEOUT '' * NO_THROW + * and mode can be: standby_replay | standby_write | standby_flush | primary_flush */ else if (Matches("WAIT")) COMPLETE_WITH("FOR"); @@ -5369,21 +5371,25 @@ match_previous_words(int pattern_id, COMPLETE_WITH("WITH"); else if (Matches("WAIT", "FOR", "LSN", MatchAny, "WITH")) COMPLETE_WITH("("); + + /* + * Handle parenthesized option list. This fires when we're in an + * unfinished parenthesized option list. get_previous_words treats a + * completed parenthesized option list as one word, so the above test is + * correct. + * + * 'mode' takes a string value ('standby_replay', 'standby_write', + * 'standby_flush', 'primary_flush'). 'timeout' takes a string value, and + * 'no_throw' takes no value. We do not offer completions for the *values* + * of 'timeout' or 'no_throw'. + */ else if (HeadMatches("WAIT", "FOR", "LSN", MatchAny, "WITH", "(*") && !HeadMatches("WAIT", "FOR", "LSN", MatchAny, "WITH", "(*)")) { - /* - * This fires if we're in an unfinished parenthesized option list. - * get_previous_words treats a completed parenthesized option list as - * one word, so the above test is correct. - */ if (ends_with(prev_wd, '(') || ends_with(prev_wd, ',')) - COMPLETE_WITH("timeout", "no_throw"); - - /* - * timeout takes a string value, no_throw takes no value. We don't - * offer completions for these values. - */ + COMPLETE_WITH("mode", "timeout", "no_throw"); + else if (TailMatches("mode")) + COMPLETE_WITH("'standby_replay'", "'standby_write'", "'standby_flush'", "'primary_flush'"); } /* WITH [RECURSIVE] */ -- 2.51.0