=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Feb 1 02:59:31 UTC 2025 On branch cf/4337 nothing to commit, working tree clean === applying patch ./v34-0001-Add-a-syntax-to-create-Incrementally-Maintainabl.patch Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/include/nodes/primnodes.h' cleanly. Applied patch to 'src/include/parser/kwlist.h' cleanly. [cf/4337 01b1ca5e59] Add a syntax to create Incrementally Maintainable Materialized Views Author: Yugo Nagata Date: Fri Dec 20 10:05:02 2019 +0900 3 files changed, 23 insertions(+), 11 deletions(-) === applying patch ./v34-0002-Add-relisivm-column-to-pg_class-system-catalog.patch Applied patch to 'src/backend/catalog/heap.c' cleanly. Applied patch to 'src/backend/catalog/index.c' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/utils/cache/lsyscache.c' cleanly. Applied patch to 'src/backend/utils/cache/relcache.c' cleanly. Applied patch to 'src/include/catalog/pg_class.h' cleanly. Applied patch to 'src/include/utils/lsyscache.h' cleanly. Applied patch to 'src/include/utils/rel.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. [cf/4337 0a76f86f1a] Add relisivm column to pg_class system catalog Author: Yugo Nagata Date: Fri Dec 20 10:07:23 2019 +0900 9 files changed, 40 insertions(+) === applying patch ./v34-0003-Allow-to-prolong-life-span-of-transition-tables-.patch Applied patch to 'src/backend/commands/trigger.c' cleanly. Applied patch to 'src/include/commands/trigger.h' cleanly. [cf/4337 278b964b58] Allow to prolong life span of transition tables until transaction end Author: Yugo Nagata Date: Fri Dec 20 10:09:45 2019 +0900 2 files changed, 81 insertions(+), 4 deletions(-) === applying patch ./v34-0004-Add-Incremental-View-Maintenance-support-to-pg_d.patch 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. U src/bin/pg_dump/pg_dump.c diff --cc src/bin/pg_dump/pg_dump.c index 02e1fdf8f7,dedb91c5f0..0000000000 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@@ -16086,14 -15822,11 +16096,21 @@@ dumpTableSchema(Archive *fout, const Ta binary_upgrade_set_pg_class_oids(fout, q, tbinfo->dobj.catId.oid); ++<<<<<<< ours + /* + * PostgreSQL 18 has disabled UNLOGGED for partitioned tables, so + * ignore it when dumping if it was set in this case. + */ + appendPQExpBuffer(q, "CREATE %s%s %s", + (tbinfo->relpersistence == RELPERSISTENCE_UNLOGGED && + tbinfo->relkind != RELKIND_PARTITIONED_TABLE) ? ++======= + appendPQExpBuffer(q, "CREATE %s%s%s %s", + tbinfo->relpersistence == RELPERSISTENCE_UNLOGGED ? ++>>>>>>> theirs "UNLOGGED " : "", + tbinfo->relkind == RELKIND_MATVIEW && tbinfo->isivm ? + "INCREMENTAL " : "", reltypename, qualrelname);