psql: Add command to use extended query protocol

back to CI dashboard

1 patchset tracked - current t46848_32

v32t46848_32posted Sep 14, 2023successwon't retryancient 3ypg 17
basef347ec76e Aug 29, 2023 - 1117 days / 8739 commits behind master (from history)
applyapplied Aug 18, 15:06
rebaselast tried Aug 18, 15:06 on 195e8e427
Applying: psql: fix \bind when FETCH_COUNT is used
Using index info to reconstruct a base tree...
M	src/bin/psql/common.c
M	src/test/regress/expected/psql.out
M	src/test/regress/sql/psql.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/psql.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/psql.sql
Auto-merging src/test/regress/expected/psql.out
CONFLICT (content): Merge conflict in src/test/regress/expected/psql.out
Auto-merging src/bin/psql/common.c
CONFLICT (content): Merge conflict in src/bin/psql/common.c
Patch failed at 0001 psql: fix \bind when FETCH_COUNT is used

/ci/repo/worktrees/worktree/rebase-apply/patch:16: indent with spaces.
    if (pset.bind_flag)
/ci/repo/worktrees/worktree/rebase-apply/patch:17: indent with spaces.
        result = PQexecParams(pset.db, buf.data, pset.bind_nparams, NULL, (const char * const *) pset.bind_params, NULL, NULL, 0);
/ci/repo/worktrees/worktree/rebase-apply/patch:18: indent with spaces.
    else
/ci/repo/worktrees/worktree/rebase-apply/patch:19: indent with spaces.
        result = PQexec(pset.db, buf.data);
/ci/repo/worktrees/worktree/rebase-apply/patch:20: trailing whitespace.
    
warning: 5 lines add whitespace errors.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/test/regress/sql/psql.sql, src/test/regress/expected/psql.out, src/bin/psql/common.c
pushAug 18, 15:06 -> f7ec96d60branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success117781 / 7812m 50s / 3m 27sdocker run ... :t46848Aug 18, 15:15
run 32152457834
executed 781 - ccache 213 hit / 4359 miss - head f7ec96d60 - digest sha256:a79493168c189d... - run 32152457834