=== Applying patches on top of PostgreSQL commit ID a28fa2947d2a507089605c47bbfa9016d457208c === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon May 18 06:05:24 UTC 2026 On branch cf/6783 nothing to commit, working tree clean === using 'git am' to apply patch ./v5-0001-Change-DETAIL-messages-to-conform-to-the-style-gu.patch === Applying: Change DETAIL messages to conform to the style guide by capitalizing the first word of sentences and ending sentences with a period. error: sha1 information is lacking or useless (src/backend/commands/tablecmds.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Change DETAIL messages to conform to the style guide by capitalizing the first word of sentences and ending sentences with a period. 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 ./v5-0001-Change-DETAIL-messages-to-conform-to-the-style-gu.patch === patching file contrib/dblink/dblink.c patching file contrib/passwordcheck/expected/passwordcheck.out patching file contrib/passwordcheck/expected/passwordcheck_1.out patching file contrib/passwordcheck/passwordcheck.c patching file contrib/pg_stash_advice/expected/pg_stash_advice.out patching file contrib/pg_stash_advice/expected/pg_stash_advice_utf8.out patching file contrib/pg_stash_advice/pg_stash_advice.c patching file contrib/postgres_fdw/expected/postgres_fdw.out patching file src/backend/commands/copyto.c patching file src/backend/commands/extension.c patching file src/backend/commands/tablecmds.c Hunk #1 succeeded at 15399 (offset 22 lines). Hunk #2 succeeded at 15414 (offset 22 lines). Hunk #3 succeeded at 15434 (offset 22 lines). Hunk #4 succeeded at 15453 (offset 22 lines). Hunk #5 succeeded at 15512 (offset 22 lines). patching file src/backend/libpq/be-secure-openssl.c patching file src/backend/partitioning/partbounds.c Hunk #1 FAILED at 5032. Hunk #2 FAILED at 5041. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/partitioning/partbounds.c.rej patching file src/test/modules/test_extensions/expected/test_extensions.out patching file src/test/regress/expected/create_view.out patching file src/test/regress/expected/partition_merge.out Hunk #1 FAILED at 35. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/partition_merge.out.rej patching file src/test/regress/expected/partition_split.out Hunk #1 FAILED at 109. Hunk #2 FAILED at 470. Hunk #3 FAILED at 482. Hunk #4 FAILED at 494. Hunk #5 FAILED at 506. 5 out of 5 hunks FAILED -- saving rejects to file src/test/regress/expected/partition_split.out.rej patching file src/test/regress/expected/rangefuncs.out Unstaged changes after reset: M contrib/dblink/dblink.c M contrib/passwordcheck/expected/passwordcheck.out M contrib/passwordcheck/expected/passwordcheck_1.out M contrib/passwordcheck/passwordcheck.c M contrib/pg_stash_advice/expected/pg_stash_advice.out M contrib/pg_stash_advice/expected/pg_stash_advice_utf8.out M contrib/pg_stash_advice/pg_stash_advice.c M contrib/postgres_fdw/expected/postgres_fdw.out M src/backend/commands/copyto.c M src/backend/commands/extension.c M src/backend/commands/tablecmds.c M src/backend/libpq/be-secure-openssl.c M src/test/modules/test_extensions/expected/test_extensions.out M src/test/regress/expected/create_view.out M src/test/regress/expected/rangefuncs.out Removing src/backend/partitioning/partbounds.c.rej Removing src/test/regress/expected/partition_merge.out.rej Removing src/test/regress/expected/partition_split.out.rej === using 'git apply' to apply patch ./v5-0001-Change-DETAIL-messages-to-conform-to-the-style-gu.patch === Applied patch to 'contrib/dblink/dblink.c' cleanly. Applied patch to 'contrib/passwordcheck/expected/passwordcheck.out' cleanly. Applied patch to 'contrib/passwordcheck/expected/passwordcheck_1.out' cleanly. Applied patch to 'contrib/passwordcheck/passwordcheck.c' cleanly. Applied patch to 'contrib/pg_stash_advice/expected/pg_stash_advice.out' cleanly. Applied patch to 'contrib/pg_stash_advice/expected/pg_stash_advice_utf8.out' cleanly. Applied patch to 'contrib/pg_stash_advice/pg_stash_advice.c' cleanly. Applied patch to 'contrib/postgres_fdw/expected/postgres_fdw.out' cleanly. Applied patch to 'src/backend/commands/copyto.c' cleanly. Applied patch to 'src/backend/commands/extension.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/libpq/be-secure-openssl.c' cleanly. Applied patch to 'src/backend/partitioning/partbounds.c' with conflicts. Applied patch to 'src/test/modules/test_extensions/expected/test_extensions.out' cleanly. Applied patch to 'src/test/regress/expected/create_view.out' cleanly. Applied patch to 'src/test/regress/expected/partition_merge.out' with conflicts. Applied patch to 'src/test/regress/expected/partition_split.out' with conflicts. Applied patch to 'src/test/regress/expected/rangefuncs.out' cleanly. U src/backend/partitioning/partbounds.c U src/test/regress/expected/partition_merge.out U src/test/regress/expected/partition_split.out diff --cc src/backend/partitioning/partbounds.c index a09beec34d8,8b1ac2a90a9..00000000000 --- a/src/backend/partitioning/partbounds.c +++ b/src/backend/partitioning/partbounds.c @@@ -5030,18 -5030,18 +5030,26 @@@ check_two_partitions_bounds_range(Relat if (is_merge) ereport(ERROR, errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("can not merge partition \"%s\" together with partition \"%s\"", + errmsg("cannot merge partition \"%s\" together with partition \"%s\"", second_name->relname, first_name->relname), ++<<<<<<< ours + errdetail("The lower bound of partition \"%s\" is not equal to the upper bound of partition \"%s\".", ++======= + errdetail("Lower bound of partition \"%s\" is not equal to the upper bound of partition \"%s\".", ++>>>>>>> theirs second_name->relname, first_name->relname), errhint("ALTER TABLE ... MERGE PARTITIONS requires the partition bounds to be adjacent."), parser_errposition(pstate, datum->location)); else ereport(ERROR, errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("can not split to partition \"%s\" together with partition \"%s\"", + errmsg("cannot split to partition \"%s\" together with partition \"%s\"", second_name->relname, first_name->relname), ++<<<<<<< ours + errdetail("The lower bound of partition \"%s\" is not equal to the upper bound of partition \"%s\".", ++======= + errdetail("Lower bound of partition \"%s\" is not equal to the upper bound of partition \"%s\".", ++>>>>>>> theirs second_name->relname, first_name->relname), errhint("ALTER TABLE ... SPLIT PARTITION requires the partition bounds to be adjacent."), parser_errposition(pstate, datum->location)); diff --cc src/test/regress/expected/partition_merge.out index d3818f1bf9b,9b8f5ee137c..00000000000 --- a/src/test/regress/expected/partition_merge.out +++ b/src/test/regress/expected/partition_merge.out @@@ -26,23 -26,25 +26,33 @@@ ALTER TABLE sales_range MERGE PARTITION ERROR: partition with name "sales_feb2022" is already used LINE 1: ...e MERGE PARTITIONS (sales_feb2022, sales_mar2022, sales_feb2... ^ --- ERROR: "sales_apr2022" is not a table +-- ERROR ALTER TABLE sales_range MERGE PARTITIONS (sales_feb2022, sales_mar2022, sales_apr2022) INTO sales_feb_mar_apr2022; ERROR: "sales_apr2022" is not a table -HINT: ALTER TABLE ... MERGE PARTITIONS can only merge partitions don't have sub-partitions. --- ERROR: can not merge partition "sales_mar2022" together with partition "sales_jan2022" --- DETAIL: lower bound of partition "sales_mar2022" is not equal to the upper bound of partition "sales_jan2022" +HINT: ALTER TABLE ... MERGE PARTITIONS can only merge partitions that don't have sub-partitions. +-- ERROR -- (space between sections sales_jan2022 and sales_mar2022) ALTER TABLE sales_range MERGE PARTITIONS (sales_jan2022, sales_mar2022) INTO sales_jan_mar2022; ++<<<<<<< ours +ERROR: cannot merge partition "sales_mar2022" together with partition "sales_jan2022" +DETAIL: The lower bound of partition "sales_mar2022" is not equal to the upper bound of partition "sales_jan2022". ++======= + ERROR: can not merge partition "sales_mar2022" together with partition "sales_jan2022" + DETAIL: Lower bound of partition "sales_mar2022" is not equal to the upper bound of partition "sales_jan2022". ++>>>>>>> theirs HINT: ALTER TABLE ... MERGE PARTITIONS requires the partition bounds to be adjacent. --- ERROR: can not merge partition "sales_jan2022" together with partition "sales_dec2021" --- DETAIL: lower bound of partition "sales_jan2022" is not equal to the upper bound of partition "sales_dec2021" +-- ERROR -- (space between sections sales_dec2021 and sales_jan2022) ALTER TABLE sales_range MERGE PARTITIONS (sales_dec2021, sales_jan2022, sales_feb2022) INTO sales_dec_jan_feb2022; ++<<<<<<< ours +ERROR: cannot merge partition "sales_jan2022" together with partition "sales_dec2021" +DETAIL: The lower bound of partition "sales_jan2022" is not equal to the upper bound of partition "sales_dec2021". ++======= + ERROR: can not merge partition "sales_jan2022" together with partition "sales_dec2021" + DETAIL: Lower bound of partition "sales_jan2022" is not equal to the upper bound of partition "sales_dec2021". ++>>>>>>> theirs HINT: ALTER TABLE ... MERGE PARTITIONS requires the partition bounds to be adjacent. --- ERROR: partition with name "sales_feb2022" is already used +-- ERROR ALTER TABLE sales_range MERGE PARTITIONS (sales_feb2022, sales_mar2022, partitions_merge_schema.sales_feb2022) INTO sales_feb_mar_apr2022; ERROR: partition with name "sales_feb2022" is already used LINE 1: ...e MERGE PARTITIONS (sales_feb2022, sales_mar2022, partitions... diff --cc src/test/regress/expected/partition_split.out index 961b37953c8,e35e859cc13..00000000000 --- a/src/test/regress/expected/partition_split.out +++ b/src/test/regress/expected/partition_split.out @@@ -103,10 -106,10 +103,14 @@@ ALTER TABLE sales_range SPLIT PARTITIO (PARTITION sales_feb2022 FOR VALUES FROM ('2022-02-01') TO ('2022-03-01'), PARTITION sales_mar2022 FOR VALUES FROM ('2022-02-01') TO ('2022-04-01'), PARTITION sales_apr2022 FOR VALUES FROM ('2022-04-01') TO ('2022-05-01')); -ERROR: can not split to partition "sales_mar2022" together with partition "sales_feb2022" +ERROR: cannot split to partition "sales_mar2022" together with partition "sales_feb2022" LINE 3: PARTITION sales_mar2022 FOR VALUES FROM ('2022-02-01') TO... ^ ++<<<<<<< ours +DETAIL: The lower bound of partition "sales_mar2022" is not equal to the upper bound of partition "sales_feb2022". ++======= + DETAIL: Lower bound of partition "sales_mar2022" is not equal to the upper bound of partition "sales_feb2022". ++>>>>>>> theirs HINT: ALTER TABLE ... SPLIT PARTITION requires the partition bounds to be adjacent. -- Tests for spaces between partitions, them should be executed without DEFAULT partition ALTER TABLE sales_range DETACH PARTITION sales_others; @@@ -462,48 -467,49 +466,64 @@@ ALTER TABLE sales_range SPLIT PARTITIO PARTITION sales_error FOR VALUES FROM ('2021-12-30') TO ('2022-02-01'), PARTITION sales_feb2022 FOR VALUES FROM ('2022-02-01') TO ('2022-03-01'), PARTITION sales_others DEFAULT); -ERROR: can not split to partition "sales_error" together with partition "sales_dec2021" +ERROR: cannot split to partition "sales_error" together with partition "sales_dec2021" LINE 3: PARTITION sales_error FOR VALUES FROM ('2021-12-30') TO (... ^ ++<<<<<<< ours +DETAIL: The lower bound of partition "sales_error" is not equal to the upper bound of partition "sales_dec2021". ++======= + DETAIL: Lower bound of partition "sales_error" is not equal to the upper bound of partition "sales_dec2021". ++>>>>>>> theirs HINT: ALTER TABLE ... SPLIT PARTITION requires the partition bounds to be adjacent. -- sales_error intersects with sales_feb2022 (upper bound) --- ERROR: can not split to partition "sales_feb2022" together with partition "sales_error" +-- ERROR ALTER TABLE sales_range SPLIT PARTITION sales_others INTO (PARTITION sales_dec2021 FOR VALUES FROM ('2021-12-01') TO ('2022-01-01'), PARTITION sales_error FOR VALUES FROM ('2022-01-01') TO ('2022-02-02'), PARTITION sales_feb2022 FOR VALUES FROM ('2022-02-01') TO ('2022-03-01'), PARTITION sales_others DEFAULT); -ERROR: can not split to partition "sales_feb2022" together with partition "sales_error" +ERROR: cannot split to partition "sales_feb2022" together with partition "sales_error" LINE 4: PARTITION sales_feb2022 FOR VALUES FROM ('2022-02-01') TO... ^ ++<<<<<<< ours +DETAIL: The lower bound of partition "sales_feb2022" is not equal to the upper bound of partition "sales_error". ++======= + DETAIL: Lower bound of partition "sales_feb2022" is not equal to the upper bound of partition "sales_error". ++>>>>>>> theirs HINT: ALTER TABLE ... SPLIT PARTITION requires the partition bounds to be adjacent. -- sales_error intersects with sales_dec2021 (inside bound) --- ERROR: can not split to partition "sales_error" together with partition "sales_dec2021" +-- ERROR ALTER TABLE sales_range SPLIT PARTITION sales_others INTO (PARTITION sales_dec2021 FOR VALUES FROM ('2021-12-01') TO ('2022-01-01'), PARTITION sales_error FOR VALUES FROM ('2021-12-10') TO ('2021-12-20'), PARTITION sales_feb2022 FOR VALUES FROM ('2022-02-01') TO ('2022-03-01'), PARTITION sales_others DEFAULT); -ERROR: can not split to partition "sales_error" together with partition "sales_dec2021" +ERROR: cannot split to partition "sales_error" together with partition "sales_dec2021" LINE 3: PARTITION sales_error FOR VALUES FROM ('2021-12-10') TO (... ^ ++<<<<<<< ours +DETAIL: The lower bound of partition "sales_error" is not equal to the upper bound of partition "sales_dec2021". ++======= + DETAIL: Lower bound of partition "sales_error" is not equal to the upper bound of partition "sales_dec2021". ++>>>>>>> theirs HINT: ALTER TABLE ... SPLIT PARTITION requires the partition bounds to be adjacent. -- sales_error intersects with sales_dec2021 (exactly the same bounds) --- ERROR: can not split to partition "sales_error" together with partition "sales_dec2021" +-- ERROR ALTER TABLE sales_range SPLIT PARTITION sales_others INTO (PARTITION sales_dec2021 FOR VALUES FROM ('2021-12-01') TO ('2022-01-01'), PARTITION sales_error FOR VALUES FROM ('2021-12-01') TO ('2022-01-01'), PARTITION sales_feb2022 FOR VALUES FROM ('2022-02-01') TO ('2022-03-01'), PARTITION sales_others DEFAULT); -ERROR: can not split to partition "sales_error" together with partition "sales_dec2021" +ERROR: cannot split to partition "sales_error" together with partition "sales_dec2021" LINE 3: PARTITION sales_error FOR VALUES FROM ('2021-12-01') TO (... ^ ++<<<<<<< ours +DETAIL: The lower bound of partition "sales_error" is not equal to the upper bound of partition "sales_dec2021". ++======= + DETAIL: Lower bound of partition "sales_error" is not equal to the upper bound of partition "sales_dec2021". ++>>>>>>> theirs HINT: ALTER TABLE ... SPLIT PARTITION requires the partition bounds to be adjacent. --- ERROR: can not split DEFAULT partition "sales_others" --- HINT: To split DEFAULT partition one of the new partition must be DEFAULT. +-- ERROR ALTER TABLE sales_range SPLIT PARTITION sales_others INTO (PARTITION sales_dec2021 FOR VALUES FROM ('2021-12-01') TO ('2022-01-01'), PARTITION sales_jan2022 FOR VALUES FROM ('2022-01-01') TO ('2022-02-01'),