From 971184c49cf2c5932bb682ee977a6fef9ba4eba5 Mon Sep 17 00:00:00 2001 From: "Anton A. Melnikov" Date: Sun, 21 Jul 2024 01:37:03 +0300 Subject: [PATCH] Remove workarounds for Debian 10 (Buster) with broken libedit from the 010_tab_completion.pl test. --- src/bin/psql/t/010_tab_completion.pl | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/bin/psql/t/010_tab_completion.pl b/src/bin/psql/t/010_tab_completion.pl index b45c39f0f5..678a0f7a2c 100644 --- a/src/bin/psql/t/010_tab_completion.pl +++ b/src/bin/psql/t/010_tab_completion.pl @@ -167,26 +167,18 @@ check_completion( qr/"mytab123" +"mytab246"/, "offer multiple quoted table choices"); -# note: broken versions of libedit want to backslash the closing quote; -# not much we can do about that -check_completion("2\t", qr/246\\?" /, +check_completion("2\t", qr/246" /, "finish completion of one of multiple quoted table choices"); -# note: broken versions of libedit may leave us in a state where psql -# thinks there's an unclosed double quote, so that we have to use -# clear_line not clear_query here -clear_line(); +clear_query(); # check handling of mixed-case names -# note: broken versions of libedit want to backslash the closing quote; -# not much we can do about that check_completion( "select * from \"mi\t", - qr/"mixedName\\?" /, + qr/"mixedName" /, "complete a mixed-case name"); -# as above, must use clear_line not clear_query here -clear_line(); +clear_query(); # check case folding check_completion("select * from TAB\t", qr/tab1 /, "automatically fold case"); @@ -198,8 +190,7 @@ clear_query(); # differently, so just check that the replacement comes out correctly check_completion("\\DRD\t", qr/drds /, "complete \\DRD to \\drds"); -# broken versions of libedit require clear_line not clear_query here -clear_line(); +clear_query(); # check completion of a schema-qualified name check_completion("select * from pub\t", @@ -261,18 +252,16 @@ check_completion( qr|tab_comp_dir/af\a?ile|, "filename completion with multiple possibilities"); -# broken versions of libedit require clear_line not clear_query here +# here we inside a string literal 'afile*' and wait for a sub-choice or second TAB. So use clear_line(). clear_line(); # COPY requires quoting -# note: broken versions of libedit want to backslash the closing quote; -# not much we can do about that check_completion( "COPY foo FROM tab_comp_dir/some\t", - qr|'tab_comp_dir/somefile\\?' |, + qr|'tab_comp_dir/somefile' |, "quoted filename completion with one possibility"); -clear_line(); +clear_query(); check_completion( "COPY foo FROM tab_comp_dir/af\t", -- 2.45.2