=== Applying patches on top of PostgreSQL commit ID bf5206f007732c64f857e6bc214f77b5f31efc6a === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jun 10 03:18:25 UTC 2026 On branch cf/6563 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Add-function-name-tab-completion-after-SELECT-in-.patch === Applying: Add function name tab completion after SELECT in psql Using index info to reconstruct a base tree... M doc/src/sgml/ref/psql-ref.sgml M src/bin/psql/t/010_tab_completion.pl M src/bin/psql/tab-complete.in.c Falling back to patching base and 3-way merge... Auto-merging src/bin/psql/tab-complete.in.c Auto-merging src/bin/psql/t/010_tab_completion.pl CONFLICT (content): Merge conflict in src/bin/psql/t/010_tab_completion.pl Auto-merging doc/src/sgml/ref/psql-ref.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add function name tab completion after SELECT in psql When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v1-0001-Add-function-name-tab-completion-after-SELECT-in-.patch === patching file doc/src/sgml/ref/psql-ref.sgml Hunk #1 succeeded at 5231 (offset 4 lines). patching file src/bin/psql/t/010_tab_completion.pl Hunk #1 FAILED at 44. Hunk #2 succeeded at 460 with fuzz 2 (offset 37 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/bin/psql/t/010_tab_completion.pl.rej patching file src/bin/psql/tab-complete.in.c Hunk #1 succeeded at 647 (offset 1 line). Hunk #2 succeeded at 666 (offset 1 line). Hunk #3 succeeded at 679 (offset 1 line). Hunk #4 succeeded at 5589 (offset 184 lines). Hunk #5 succeeded at 6173 (offset 186 lines). Unstaged changes after reset: M doc/src/sgml/ref/psql-ref.sgml M src/bin/psql/t/010_tab_completion.pl M src/bin/psql/tab-complete.in.c Removing src/bin/psql/t/010_tab_completion.pl.rej === using 'git apply' to apply patch ./v1-0001-Add-function-name-tab-completion-after-SELECT-in-.patch === Applied patch to 'doc/src/sgml/ref/psql-ref.sgml' cleanly. Applied patch to 'src/bin/psql/t/010_tab_completion.pl' with conflicts. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. U src/bin/psql/t/010_tab_completion.pl diff --cc src/bin/psql/t/010_tab_completion.pl index 64e27ef87a3,fcdc72b4720..00000000000 --- a/src/bin/psql/t/010_tab_completion.pl +++ b/src/bin/psql/t/010_tab_completion.pl @@@ -45,8 -45,7 +45,12 @@@ $node->safe_psql('postgres' . "CREATE TABLE \"mixedName\" (f1 int, f2 text);\n" . "CREATE TYPE enum1 AS ENUM ('foo', 'bar', 'baz', 'BLACK');\n" . "CREATE PUBLICATION some_publication;\n" ++<<<<<<< ours + . "CREATE TABLE fpo_test (id int4range, valid_at daterange, name text);\n" +); ++======= + . "CREATE FUNCTION tcfunc_test(int) RETURNS int LANGUAGE sql AS 'SELECT 1';\n"); ++>>>>>>> theirs # In a VPATH build, we'll be started in the source directory, but we want # to run in the build directory so that we can use relative paths to @@@ -424,39 -424,19 +428,55 @@@ check_completion clear_line(); ++<<<<<<< ours +# check tab completion for DELETE ... FOR PORTION OF +check_completion( + "DELETE FROM fpo_test F\t", + qr/FOR /, + "complete DELETE FROM F to FOR"); + +check_completion("P\t", qr/PORTION /, "complete FOR P to PORTION"); + +check_completion("O\t", qr/OF /, "complete PORTION O to OF"); + +check_completion("v\t", qr/valid_at /, + "complete FOR PORTION OF offers column names"); + +check_completion("FR\t", qr/FROM /, + "complete FOR PORTION OF FR to FROM"); + +clear_query(); + +# check tab completion for UPDATE ... FOR PORTION OF +check_completion( + "UPDATE fpo_test F\t", + qr/FOR /, + "complete UPDATE
F to FOR"); + +check_completion("P\t", qr/PORTION /, "complete FOR P to PORTION"); + +check_completion("O\t", qr/OF /, "complete PORTION O to OF"); + +check_completion("v\t", qr/valid_at /, + "complete FOR PORTION OF offers column names"); + +check_completion("FR\t", qr/FROM /, + "complete FOR PORTION OF FR to FROM"); ++======= + # check completion of function names after SELECT + check_completion( + "SELECT tcfunc_te\t", + qr/tcfunc_test\b/, + "complete function name after SELECT"); + + clear_query(); + + # check that pg_ prefix enables system function completion + check_completion( + "SELECT pg_cancel_b\t", + qr/pg_cancel_backend\b/, + "complete pg_catalog function with pg_ prefix in SELECT"); ++>>>>>>> theirs clear_query();