Put new command-line options into alphabetical order

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 50809b4844373044380788ad9211918ffc7f9550..64ced9fe045b46fb4f0deee57414a610612bf2d3 100644 (file)
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -804,6 +804,21 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--load-via-partition-root</option></term>
+      <listitem>
+       <para>
+        When dumping a <command>COPY</command> or <command>INSERT</command> statement for a partitioned table,
+        target the root of the partitioning hierarchy which contains it rather
+        than the partition itself.  This may be useful when reloading data on
+        a server where rows do not always fall into the same partitions as
+        they did on the original server.  This could happen, for example, if
+        the partitioning column is of type text and the two system have
+        different definitions of the collation used to partition the data.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--no-comments</option></term>
       <listitem>
@@ -912,21 +927,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--load-via-partition-root</option></term>
-      <listitem>
-       <para>
-        When dumping a COPY or INSERT statement for a partitioned table,
-        target the root of the partitioning hierarchy which contains it rather
-        than the partition itself.  This may be useful when reloading data on
-        a server where rows do not always fall into the same partitions as
-        they did on the original server.  This could happen, for example, if
-        the partitioning column is of type text and the two system have
-        different definitions of the collation used to partition the data.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
        <term><option>--section=<replaceable class="parameter">sectionname</replaceable></option></term>
        <listitem>

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 5d6fe9b87d5ff65ce4d6233ebd35c9726c30e495..8e5e7f9ef8a67265df632c9d6c516ee9f8faff04 100644 (file)
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -342,6 +342,21 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--load-via-partition-root</option></term>
+      <listitem>
+       <para>
+        When dumping a <command>COPY</command> or <command>INSERT</command> statement for a partitioned table,
+        target the root of the partitioning hierarchy which contains it rather
+        than the partition itself.  This may be useful when reloading data on
+        a server where rows do not always fall into the same partitions as
+        they did on the original server.  This could happen, for example, if
+        the partitioning column is of type text and the two system have
+        different definitions of the collation used to partition the data.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--no-comments</option></term>
       <listitem>
@@ -449,21 +464,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--load-via-partition-root</option></term>
-      <listitem>
-       <para>
-        When dumping a COPY or INSERT statement for a partitioned table,
-        target the root of the partitioning hierarchy which contains it rather
-        than the partition itself.  This may be useful when reloading data on
-        a server where rows do not always fall into the same partitions as
-        they did on the original server.  This could happen, for example, if
-        the partitioning column is of type text and the two system have
-        different definitions of the collation used to partition the data.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>--use-set-session-authorization</option></term>
       <listitem>

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index f8fbcdad5bd48b0dbce1c88d5ed5eceaa2fe5478..ea2f022eeebdd8a3e19fb9102c4d12ccfd084eed 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -981,6 +981,7 @@ help(const char *progname)
        printf(_("  --exclude-table-data=TABLE   do NOT dump data for the named table(s)\n"));
        printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
        printf(_("  --inserts                    dump data as INSERT commands, rather than COPY\n"));
+       printf(_("  --load-via-partition-root    load partitions via the root table\n"));
        printf(_("  --no-comments                do not dump comments\n"));
        printf(_("  --no-publications            do not dump publications\n"));
        printf(_("  --no-security-labels         do not dump security label assignments\n"));
@@ -989,7 +990,6 @@ help(const char *progname)
        printf(_("  --no-tablespaces             do not dump tablespace assignments\n"));
        printf(_("  --no-unlogged-table-data     do not dump unlogged table data\n"));
        printf(_("  --quote-all-identifiers      quote all identifiers, even if not key words\n"));
-       printf(_("  --load-via-partition-root    load partitions via the root table\n"));
        printf(_("  --section=SECTION            dump named section (pre-data, data, or post-data)\n"));
        printf(_("  --serializable-deferrable    wait until the dump can run without anomalies\n"));
        printf(_("  --snapshot=SNAPSHOT          use given snapshot for the dump\n"));

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 55de7449b459677015cda6e2fb8cc74a39c9ef57..54db0cd1745916847bbdb29107bfa21acb899d1d 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -612,6 +612,7 @@ help(void)
        printf(_("  --disable-triggers           disable triggers during data-only restore\n"));
        printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
        printf(_("  --inserts                    dump data as INSERT commands, rather than COPY\n"));
+       printf(_("  --load-via-partition-root    load partitions via the root table\n"));
        printf(_("  --no-comments                do not dump comments\n"));
        printf(_("  --no-publications            do not dump publications\n"));
        printf(_("  --no-role-passwords          do not dump passwords for roles\n"));
@@ -621,7 +622,6 @@ help(void)
        printf(_("  --no-tablespaces             do not dump tablespace assignments\n"));
        printf(_("  --no-unlogged-table-data     do not dump unlogged table data\n"));
        printf(_("  --quote-all-identifiers      quote all identifiers, even if not key words\n"));
-       printf(_("  --load-via-partition-root    load partitions via the root table\n"));
        printf(_("  --use-set-session-authorization\n"
                         "                               use SET SESSION AUTHORIZATION commands instead of\n"
                         "                               ALTER OWNER commands to set ownership\n"));

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index edc14f176fa13b6017beb3c8e065b0a742d5c091..2342a6357121ae053fcb6e9715bd9ab9bd846675 100644 (file)
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -483,9 +483,9 @@ usage(const char *progname)
        printf(_("  --disable-triggers           disable triggers during data-only restore\n"));
        printf(_("  --enable-row-security        enable row security\n"));
        printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
+       printf(_("  --no-comments                do not dump comments\n"));
        printf(_("  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
                         "                               created\n"));
-       printf(_("  --no-comments                do not dump comments\n"));
        printf(_("  --no-publications            do not restore publications\n"));
        printf(_("  --no-security-labels         do not restore security labels\n"));
        printf(_("  --no-subscriptions           do not restore subscriptions\n"));