=== Applying patches on top of PostgreSQL commit ID 85c17f612af7b9c47a9828805686f0dd2433cdf1 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Apr 13 05:50:28 UTC 2026 On branch cf/6664 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Rename-identifiers-to-use-generic-relation-orient.patch === Applying: Rename identifiers to use generic relation-oriented names === using 'git am' to apply patch ./v2-0002-Support-EXCEPT-for-ALL-SEQUENCES-in-CREATE-PUBLIC.patch === Applying: Support EXCEPT for ALL SEQUENCES in CREATE PUBLICATION Using index info to reconstruct a base tree... M src/bin/pg_dump/pg_dump.c M src/bin/psql/describe.c Falling back to patching base and 3-way merge... Auto-merging src/bin/psql/describe.c Auto-merging src/bin/pg_dump/pg_dump.c CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dump.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 Support EXCEPT for ALL SEQUENCES in CREATE PUBLICATION 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 ./v2-0002-Support-EXCEPT-for-ALL-SEQUENCES-in-CREATE-PUBLIC.patch === patching file doc/src/sgml/catalogs.sgml patching file doc/src/sgml/logical-replication.sgml patching file doc/src/sgml/ref/create_publication.sgml patching file src/backend/catalog/pg_publication.c patching file src/backend/commands/publicationcmds.c patching file src/backend/parser/gram.y patching file src/bin/pg_dump/pg_dump.c Hunk #4 FAILED at 4733. 1 out of 4 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_dump.c.rej patching file src/bin/pg_dump/pg_dump.h patching file src/bin/pg_dump/t/002_pg_dump.pl patching file src/bin/psql/describe.c patching file src/bin/psql/tab-complete.in.c patching file src/include/catalog/pg_publication.h patching file src/include/nodes/parsenodes.h patching file src/test/regress/expected/publication.out patching file src/test/regress/sql/publication.sql patching file src/test/subscription/t/037_except.pl Unstaged changes after reset: M doc/src/sgml/catalogs.sgml M doc/src/sgml/logical-replication.sgml M doc/src/sgml/ref/create_publication.sgml M src/backend/catalog/pg_publication.c M src/backend/commands/publicationcmds.c M src/backend/parser/gram.y M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/psql/describe.c M src/bin/psql/tab-complete.in.c M src/include/catalog/pg_publication.h M src/include/nodes/parsenodes.h M src/test/regress/expected/publication.out M src/test/regress/sql/publication.sql M src/test/subscription/t/037_except.pl Removing src/bin/pg_dump/pg_dump.c.rej === using 'git apply' to apply patch ./v2-0002-Support-EXCEPT-for-ALL-SEQUENCES-in-CREATE-PUBLIC.patch === Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly. Applied patch to 'doc/src/sgml/logical-replication.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/create_publication.sgml' cleanly. Applied patch to 'src/backend/catalog/pg_publication.c' cleanly. Applied patch to 'src/backend/commands/publicationcmds.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' with conflicts. Applied patch to 'src/bin/pg_dump/pg_dump.h' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. Applied patch to 'src/bin/psql/describe.c' cleanly. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/include/catalog/pg_publication.h' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/test/regress/expected/publication.out' cleanly. Applied patch to 'src/test/regress/sql/publication.sql' cleanly. Applied patch to 'src/test/subscription/t/037_except.pl' cleanly. U src/bin/pg_dump/pg_dump.c diff --cc src/bin/pg_dump/pg_dump.c index 1ca03d6b278,25167c4a487..00000000000 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@@ -4720,13 -4732,31 +4732,35 @@@ dumpPublication(Archive *fout, const Pu appendPQExpBuffer(query, "TABLE ONLY %s", fmtQualifiedDumpable(tbinfo)); } if (n_except > 0) ++<<<<<<< ours + appendPQExpBufferChar(query, ')'); ++======= + appendPQExpBufferStr(query, ")"); + } + if (pubinfo->puballsequences) + { + int n_except = 0; ++>>>>>>> theirs - if (pubinfo->puballsequences) + if (pubinfo->puballtables) appendPQExpBufferStr(query, ", ALL SEQUENCES"); + else + appendPQExpBufferStr(query, " FOR ALL SEQUENCES"); + + /* Include EXCEPT (SEQUENCE) clause if there are except_sequences. */ + for (SimplePtrListCell *cell = pubinfo->except_sequences.head; cell; cell = cell->next) + { + TableInfo *tbinfo = (TableInfo *) cell->ptr; + + if (++n_except == 1) + appendPQExpBufferStr(query, " EXCEPT ("); + else + appendPQExpBufferStr(query, ", "); + appendPQExpBuffer(query, "SEQUENCE %s", fmtQualifiedDumpable(tbinfo)); + } + if (n_except > 0) + appendPQExpBufferStr(query, ")"); } - else if (pubinfo->puballsequences) - appendPQExpBufferStr(query, " FOR ALL SEQUENCES"); appendPQExpBufferStr(query, " WITH (publish = '"); if (pubinfo->pubinsert)