=== Applying patches on top of PostgreSQL commit ID 901ed9b352b41f034e17bc540725082a488fce31 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun May 10 12:28:21 UTC 2026
On branch cf/6400
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Introduce-a-new-function-pg_get_publication_ddl.patch ===
Applying: Introduce a new function pg_get_publication_ddl() that returns the CREATE ddl statement for a giving PUBLICATION.
Using index info to reconstruct a base tree...
M	doc/src/sgml/func/func-info.sgml
M	src/backend/utils/adt/ruleutils.c
M	src/include/catalog/pg_proc.dat
M	src/test/regress/parallel_schedule
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/parallel_schedule
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/adt/ruleutils.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/ruleutils.c
Auto-merging doc/src/sgml/func/func-info.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/func/func-info.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Introduce a new function pg_get_publication_ddl() that returns the CREATE ddl statement for a giving 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 ./v1-0001-Introduce-a-new-function-pg_get_publication_ddl.patch ===
patching file doc/src/sgml/func/func-info.sgml
Hunk #1 succeeded at 3967 (offset 137 lines).
patching file src/backend/utils/adt/ruleutils.c
Hunk #1 FAILED at 30.
Hunk #2 succeeded at 557 (offset 11 lines).
Hunk #3 succeeded at 14365 (offset 621 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/backend/utils/adt/ruleutils.c.rej
patching file src/include/catalog/pg_proc.dat
Hunk #1 succeeded at 12383 (offset 47 lines).
patching file src/test/regress/expected/publication_ddl.out
patching file src/test/regress/parallel_schedule
Hunk #1 succeeded at 143 (offset 6 lines).
patching file src/test/regress/sql/publication_ddl.sql
Unstaged changes after reset:
M	doc/src/sgml/func/func-info.sgml
M	src/backend/utils/adt/ruleutils.c
M	src/include/catalog/pg_proc.dat
M	src/test/regress/parallel_schedule
Removing src/backend/utils/adt/ruleutils.c.rej
Removing src/test/regress/expected/publication_ddl.out
Removing src/test/regress/sql/publication_ddl.sql
=== using 'git apply' to apply patch ./v1-0001-Introduce-a-new-function-pg_get_publication_ddl.patch ===
Applied patch to 'doc/src/sgml/func/func-info.sgml' with conflicts.
Applied patch to 'src/backend/utils/adt/ruleutils.c' with conflicts.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Falling back to direct application...
Applied patch to 'src/test/regress/parallel_schedule' cleanly.
Falling back to direct application...
U doc/src/sgml/func/func-info.sgml
U src/backend/utils/adt/ruleutils.c
diff --cc doc/src/sgml/func/func-info.sgml
index 00f64f50ceb,600534ff11f..00000000000
--- a/doc/src/sgml/func/func-info.sgml
+++ b/doc/src/sgml/func/func-info.sgml
@@@ -3865,12 -3835,9 +3865,18 @@@ acl      | {postgres=arwdDxtm/postgres,
  
     <para>
      The functions shown in <xref linkend="functions-get-object-ddl-table"/>
++<<<<<<< ours
 +    reconstruct DDL statements for various global database objects.
 +    Each function returns a set of text rows, one SQL statement per row.
 +    (This is a decompiled reconstruction, not the original text of the
 +    command.)  Functions that accept <literal>VARIADIC</literal> options
 +    take alternating name/value text pairs; values are parsed as boolean,
 +    integer or text.
++=======
+     print the DDL statements for various database objects.
+     (This is a decompiled reconstruction, not the original text
+     of the command.)
++>>>>>>> theirs
     </para>
  
     <table id="functions-get-object-ddl-table">
@@@ -3891,74 -3858,14 +3897,85 @@@
        <row>
         <entry role="func_table_entry"><para role="func_signature">
          <indexterm>
++<<<<<<< ours
 +         <primary>pg_get_role_ddl</primary>
 +        </indexterm>
 +        <function>pg_get_role_ddl</function>
 +        ( <parameter>role</parameter> <type>regrole</type>
 +        <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
 +        <type>text</type> </optional> )
 +        <returnvalue>setof text</returnvalue>
 +       </para>
 +       <para>
 +        Reconstructs the <command>CREATE ROLE</command> statement and any
 +        <command>ALTER ROLE ... SET</command> statements for the given role.
 +        Each statement is returned as a separate row.
 +        Password information is never included in the output.
 +        The following options are supported: <literal>pretty</literal> (boolean)
 +        for pretty-printed output and <literal>memberships</literal> (boolean,
 +        default true) to include <command>GRANT</command> statements for
 +        role memberships and their options.
 +       </para></entry>
 +      </row>
 +      <row>
 +       <entry role="func_table_entry"><para role="func_signature">
 +        <indexterm>
 +         <primary>pg_get_tablespace_ddl</primary>
 +        </indexterm>
 +        <function>pg_get_tablespace_ddl</function>
 +        ( <parameter>tablespace</parameter> <type>oid</type>
 +        <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
 +        <type>text</type> </optional> )
 +        <returnvalue>setof text</returnvalue>
 +       </para>
 +       <para role="func_signature">
 +        <function>pg_get_tablespace_ddl</function>
 +        ( <parameter>tablespace</parameter> <type>name</type>
 +        <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
 +        <type>text</type> </optional> )
 +        <returnvalue>setof text</returnvalue>
 +       </para>
 +       <para>
 +        Reconstructs the <command>CREATE TABLESPACE</command> statement for
 +        the specified tablespace (by OID or name).  If the tablespace has
 +        options set, an <command>ALTER TABLESPACE ... SET</command> statement
 +        is also returned.  Each statement is returned as a separate row.
 +        The following options are supported: <literal>pretty</literal> (boolean)
 +        for formatted output and <literal>owner</literal> (boolean) to include
 +        <literal>OWNER</literal>.
 +       </para></entry>
 +      </row>
 +      <row>
 +       <entry role="func_table_entry"><para role="func_signature">
 +        <indexterm>
 +         <primary>pg_get_database_ddl</primary>
 +        </indexterm>
 +        <function>pg_get_database_ddl</function>
 +        ( <parameter>database</parameter> <type>regdatabase</type>
 +        <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
 +        <type>text</type> </optional> )
 +        <returnvalue>setof text</returnvalue>
 +       </para>
 +       <para>
 +        Reconstructs the <command>CREATE DATABASE</command> statement for the
 +        specified database, followed by <command>ALTER DATABASE</command>
 +        statements for connection limit, template status, and configuration
 +        settings.  Each statement is returned as a separate row.
 +        The following options are supported:
 +        <literal>pretty</literal> (boolean) for formatted output,
 +        <literal>owner</literal> (boolean) to include <literal>OWNER</literal>,
 +        and <literal>tablespace</literal> (boolean) to include
 +        <literal>TABLESPACE</literal>.
++=======
+          <primary>pg_get_publication_ddl</primary>
+         </indexterm>
+         <function>pg_get_publication_ddl</function> ( <parameter>publication</parameter> <type>text</type> or <type>oid</type> )
+         <returnvalue>text</returnvalue>
+        </para>
+        <para>
+         Recreate the CREATE statement for a giving PUBLICATION.
+         The result is a complete <command>CREATE PUBLICATION</command> statement.
++>>>>>>> theirs
         </para></entry>
        </row>
       </tbody>
@@@ -3967,4 -3874,5 +3984,8 @@@
  
    </sect2>
  
++<<<<<<< ours
++=======
+ 
++>>>>>>> theirs
    </sect1>
diff --cc src/backend/utils/adt/ruleutils.c
index 88de5c0481c,b4e06d3f883..00000000000
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@@ -34,11 -35,7 +35,15 @@@
  #include "catalog/pg_operator.h"
  #include "catalog/pg_partitioned_table.h"
  #include "catalog/pg_proc.h"
++<<<<<<< ours
 +#include "catalog/pg_propgraph_element.h"
 +#include "catalog/pg_propgraph_element_label.h"
 +#include "catalog/pg_propgraph_label.h"
 +#include "catalog/pg_propgraph_label_property.h"
 +#include "catalog/pg_propgraph_property.h"
++=======
+ #include "catalog/pg_publication_rel.h"
++>>>>>>> theirs
  #include "catalog/pg_statistic_ext.h"
  #include "catalog/pg_trigger.h"
  #include "catalog/pg_type.h"