aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2018-06-04 15:03:15 -0400
committerPeter Eisentraut <peter_e@gmx.net>2018-06-04 15:03:15 -0400
commit4d6a854f176dbb48e62f017d8234f4736cb48d24 (patch)
tree2f2d8262c215287992fe97c19409a137eb0e8295
parent12b9affb32a636777062b3feb5816621363fc108 (diff)
downloadpostgresql-4d6a854f176dbb48e62f017d8234f4736cb48d24.tar.gz
postgresql-4d6a854f176dbb48e62f017d8234f4736cb48d24.zip
Put new command-line options into alphabetical order
-rw-r--r--doc/src/sgml/ref/pg_dump.sgml30
-rw-r--r--doc/src/sgml/ref/pg_dumpall.sgml30
-rw-r--r--src/bin/pg_dump/pg_dump.c2
-rw-r--r--src/bin/pg_dump/pg_dumpall.c2
-rw-r--r--src/bin/pg_dump/pg_restore.c2
5 files changed, 33 insertions, 33 deletions
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 50809b48443..64ced9fe045 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -805,6 +805,21 @@ PostgreSQL documentation
</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>
<para>
@@ -913,21 +928,6 @@ PostgreSQL documentation
</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>
<para>
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 5d6fe9b87d5..8e5e7f9ef8a 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -343,6 +343,21 @@ PostgreSQL documentation
</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>
<para>
@@ -450,21 +465,6 @@ PostgreSQL documentation
</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>
<para>
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index f8fbcdad5bd..ea2f022eeeb 100644
--- 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 55de7449b45..54db0cd1745 100644
--- 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 edc14f176fa..2342a635712 100644
--- 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"));