=== Applying patches on top of PostgreSQL commit ID 138da727a174219da2d408382e50f8628f1fa38f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Oct 8 05:47:19 UTC 2025 On branch cf/6074 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Disallow-BEGIN-ATOMIC-functions-depending-on-temp.patch === Applying: Disallow BEGIN ATOMIC functions depending on temp relations Using index info to reconstruct a base tree... M src/backend/catalog/pg_proc.c M src/test/regress/expected/returning.out Falling back to patching base and 3-way merge... Auto-merging src/test/regress/expected/returning.out CONFLICT (content): Merge conflict in src/test/regress/expected/returning.out Auto-merging src/backend/catalog/pg_proc.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Disallow BEGIN ATOMIC functions depending on temp relations 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". Unstaged changes after reset: M src/backend/catalog/pg_proc.c M src/backend/executor/functions.c M src/include/executor/functions.h M src/test/regress/expected/create_function_sql.out M src/test/regress/expected/returning.out M src/test/regress/sql/create_function_sql.sql M src/test/regress/sql/returning.sql === using patch(1) to apply patch ./v2-0001-Disallow-BEGIN-ATOMIC-functions-depending-on-temp.patch === patching file src/backend/catalog/pg_proc.c patching file src/backend/executor/functions.c patching file src/include/executor/functions.h patching file src/test/regress/expected/create_function_sql.out patching file src/test/regress/expected/returning.out Hunk #6 FAILED at 547. Hunk #7 FAILED at 580. Hunk #8 FAILED at 620. 3 out of 14 hunks FAILED -- saving rejects to file src/test/regress/expected/returning.out.rej patching file src/test/regress/sql/create_function_sql.sql patching file src/test/regress/sql/returning.sql Unstaged changes after reset: M src/backend/catalog/pg_proc.c M src/backend/executor/functions.c M src/include/executor/functions.h M src/test/regress/expected/create_function_sql.out M src/test/regress/expected/returning.out M src/test/regress/sql/create_function_sql.sql M src/test/regress/sql/returning.sql Removing src/test/regress/expected/returning.out.rej === using 'git apply' to apply patch ./v2-0001-Disallow-BEGIN-ATOMIC-functions-depending-on-temp.patch === Applied patch to 'src/backend/catalog/pg_proc.c' cleanly. Applied patch to 'src/backend/executor/functions.c' cleanly. Applied patch to 'src/include/executor/functions.h' cleanly. Applied patch to 'src/test/regress/expected/create_function_sql.out' cleanly. Applied patch to 'src/test/regress/expected/returning.out' with conflicts. Applied patch to 'src/test/regress/sql/create_function_sql.sql' cleanly. Applied patch to 'src/test/regress/sql/returning.sql' cleanly. U src/test/regress/expected/returning.out diff --cc src/test/regress/expected/returning.out index d02c2ceab53,5b2e468d1d8..00000000000 --- a/src/test/regress/expected/returning.out +++ b/src/test/regress/expected/returning.out @@@ -547,11 -547,11 +547,16 @@@ INSERT INTO foo VALUES (5, 'subquery te (SELECT max(new.f4 + x) FROM generate_series(1, 10) x) new_max; QUERY PLAN --------------------------------------------------------------- ++<<<<<<< ours + Insert on pg_temp.foo + Output: (SubPlan expr_1), (SubPlan expr_2) ++======= + Insert on public.foo + Output: (SubPlan 1), (SubPlan 2) ++>>>>>>> theirs -> Result Output: 5, 'subquery test'::text, 42, '99'::bigint - SubPlan 1 + SubPlan expr_1 -> Aggregate Output: max((old.f4 + x.x)) -> Function Scan on pg_catalog.generate_series x @@@ -578,20 -578,20 +583,28 @@@ UPDATE foo SET f4 = 100 WHERE f1 = RETURNING (SELECT old.f4 = new.f4), (SELECT max(old.f4 + x) FROM generate_series(1, 10) x) old_max, (SELECT max(new.f4 + x) FROM generate_series(1, 10) x) new_max; ++<<<<<<< ours + QUERY PLAN +---------------------------------------------------------------- + Update on pg_temp.foo + Output: (SubPlan expr_1), (SubPlan expr_2), (SubPlan expr_3) + Update on pg_temp.foo foo_1 ++======= + QUERY PLAN + --------------------------------------------------------------- + Update on public.foo + Output: (SubPlan 1), (SubPlan 2), (SubPlan 3) + Update on public.foo foo_1 ++>>>>>>> theirs -> Result Output: '100'::bigint, foo_1.tableoid, foo_1.ctid - -> Seq Scan on pg_temp.foo foo_1 + -> Seq Scan on public.foo foo_1 Output: foo_1.tableoid, foo_1.ctid Filter: (foo_1.f1 = 5) - SubPlan 1 + SubPlan expr_1 -> Result Output: (old.f4 = new.f4) - SubPlan 2 + SubPlan expr_2 -> Aggregate Output: max((old.f4 + x.x)) -> Function Scan on pg_catalog.generate_series x @@@ -620,13 -620,13 +633,20 @@@ DELETE FROM foo WHERE f1 = (SELECT max(new.f4 + x) FROM generate_series(1, 10) x) new_max; QUERY PLAN --------------------------------------------------------------- ++<<<<<<< ours + Delete on pg_temp.foo + Output: (SubPlan expr_1), (SubPlan expr_2) + Delete on pg_temp.foo foo_1 + -> Seq Scan on pg_temp.foo foo_1 ++======= + Delete on public.foo + Output: (SubPlan 1), (SubPlan 2) + Delete on public.foo foo_1 + -> Seq Scan on public.foo foo_1 ++>>>>>>> theirs Output: foo_1.tableoid, foo_1.ctid Filter: (foo_1.f1 = 5) - SubPlan 1 + SubPlan expr_1 -> Aggregate Output: max((old.f4 + x.x)) -> Function Scan on pg_catalog.generate_series x