Rename pg_dump --no-security-label to --no-security-labels

Other similar options also use the plural form.

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index cb1773eeaa63fe350ba55d2c958eba6f6319c1c8..cca2ed4e4f65b3d15b083ebda6d73ac99a354083 100644 (file)
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -702,7 +702,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--no-security-label</option></term>
+      <term><option>--no-security-labels</option></term>
       <listitem>
        <para>
         Do not dump security labels.

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 04e95e876d1bac5832ca76775baf13b9118b979c..039e86ec90d54698560afd7e6ed7c48da5d3eb61 100644 (file)
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -193,7 +193,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--no-security-label</option></term>
+      <term><option>--no-security-labels</option></term>
       <listitem>
        <para>
         Do not dump security labels.

diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index bf261af9d6debb7e37f618e2ac8e516b1f89c713..a7202e24228d16b9e3bbc2b81864c58cf8f13b90 100644 (file)
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -340,7 +340,7 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>--no-security-label</option></term>
+      <term><option>--no-security-labels</option></term>
       <listitem>
        <para>
         Do not output commands to restore security labels,

diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index b37cc19c4e47e204e6776a05dfc456c429acdc95..28175674c00cd0206737f4b3c2eec5d8dae843ca 100644 (file)
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -104,7 +104,7 @@ typedef struct _restoreOptions
                                         * restore */
    int         use_setsessauth;/* Use SET SESSION AUTHORIZATION commands
                                 * instead of OWNER TO */
-   int         skip_seclabel;  /* Skip security label entries */
+   int         no_security_labels; /* Skip security label entries */
    char       *superuser;      /* Username to use as superuser */
    char       *use_role;       /* Issue SET ROLE to this */
    int         dataOnly;

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 7e1ce20745c20b48f2b48d4c04af580b17f78eef..0e1037cf00d56f88c8ce98c5f840c757b00e0594 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2352,7 +2352,7 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt, bool include_acls)
        return 0;
 
    /* If it's security labels, maybe ignore it */
-   if (ropt->skip_seclabel && strcmp(te->desc, "SECURITY LABEL") == 0)
+   if (ropt->no_security_labels && strcmp(te->desc, "SECURITY LABEL") == 0)
        return 0;
 
    /* Ignore DATABASE entry unless we should create it */

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 616c8855a06e43112f5e7d77eb70ac2752e816bd..c5eaa189b94cb3ff7f0f7c27f3bf2234903033e5 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -135,7 +135,7 @@ static int  binary_upgrade = 0;
 static int disable_dollar_quoting = 0;
 static int dump_inserts = 0;
 static int column_inserts = 0;
-static int no_security_label = 0;
+static int no_security_labels = 0;
 static int no_unlogged_table_data = 0;
 static int serializable_deferrable = 0;
 
@@ -329,7 +329,7 @@ main(int argc, char **argv)
        {"role", required_argument, NULL, 3},
        {"serializable-deferrable", no_argument, &serializable_deferrable, 1},
        {"use-set-session-authorization", no_argument, &use_setsessauth, 1},
-       {"no-security-label", no_argument, &no_security_label, 1},
+       {"no-security-labels", no_argument, &no_security_labels, 1},
        {"no-unlogged-table-data", no_argument, &no_unlogged_table_data, 1},
 
        {NULL, 0, NULL, 0}
@@ -651,8 +651,8 @@ main(int argc, char **argv)
    /*
     * Disables security label support if server version < v9.1.x
     */
-   if (!no_security_label && g_fout->remoteVersion < 90100)
-       no_security_label = 1;
+   if (!no_security_labels && g_fout->remoteVersion < 90100)
+       no_security_labels = 1;
 
    /*
     * Start transaction-snapshot mode transaction to dump consistent data.
@@ -862,7 +862,7 @@ help(const char *progname)
    printf(_("  --quote-all-identifiers     quote all identifiers, even if not keywords\n"));
    printf(_("  --serializable-deferrable   wait until the dump can run without anomalies\n"));
    printf(_("  --role=ROLENAME             do SET ROLE before dump\n"));
-   printf(_("  --no-security-label         do not dump security label assignments\n"));
+   printf(_("  --no-security-labels        do not dump security label assignments\n"));
    printf(_("  --no-unlogged-table-data    do not dump unlogged table data\n"));
    printf(_("  --use-set-session-authorization\n"
             "                              use SET SESSION AUTHORIZATION commands instead of\n"
@@ -11535,8 +11535,8 @@ dumpSecLabel(Archive *fout, const char *target,
    int         i;
    PQExpBuffer query;
 
-   /* do nothing, if --no-security-label is supplied */
-   if (no_security_label)
+   /* do nothing, if --no-security-labels is supplied */
+   if (no_security_labels)
        return;
 
    /* Comments are schema not data ... except blob comments are data */
@@ -11598,8 +11598,8 @@ dumpTableSecLabel(Archive *fout, TableInfo *tbinfo, const char *reltypename)
    PQExpBuffer query;
    PQExpBuffer target;
 
-   /* do nothing, if --no-security-label is supplied */
-   if (no_security_label)
+   /* do nothing, if --no-security-labels is supplied */
+   if (no_security_labels)
        return;
 
    /* SecLabel are SCHEMA not data */

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 41a330763ff5f258c27aab9ee7e219a622163dfd..305ccbe36cc30fa9fae3c8a867a97812e27a2851 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -69,7 +69,7 @@ static int    disable_triggers = 0;
 static int inserts = 0;
 static int no_tablespaces = 0;
 static int use_setsessauth = 0;
-static int no_security_label = 0;
+static int no_security_labels = 0;
 static int no_unlogged_table_data = 0;
 static int server_version;
 
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
        {"quote-all-identifiers", no_argument, &quote_all_identifiers, 1},
        {"role", required_argument, NULL, 3},
        {"use-set-session-authorization", no_argument, &use_setsessauth, 1},
-       {"no-security-label", no_argument, &no_security_label, 1},
+       {"no-security-labels", no_argument, &no_security_labels, 1},
        {"no-unlogged-table-data", no_argument, &no_unlogged_table_data, 1},
 
        {NULL, 0, NULL, 0}
@@ -353,8 +353,8 @@ main(int argc, char *argv[])
        appendPQExpBuffer(pgdumpopts, " --quote-all-identifiers");
    if (use_setsessauth)
        appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization");
-   if (no_security_label)
-       appendPQExpBuffer(pgdumpopts, " --no-security-label");
+   if (no_security_labels)
+       appendPQExpBuffer(pgdumpopts, " --no-security-labels");
    if (no_unlogged_table_data)
        appendPQExpBuffer(pgdumpopts, " --no-unlogged-table-data");
 
@@ -553,7 +553,7 @@ help(void)
    printf(_("  --no-tablespaces            do not dump tablespace assignments\n"));
    printf(_("  --quote-all-identifiers     quote all identifiers, even if not keywords\n"));
    printf(_("  --role=ROLENAME             do SET ROLE before dump\n"));
-   printf(_("  --no-security-label         do not dump security label assignments\n"));
+   printf(_("  --no-security-labels        do not dump security label assignments\n"));
    printf(_("  --no-unlogged-table-data    do not dump unlogged table data\n"));
    printf(_("  --use-set-session-authorization\n"
             "                              use SET SESSION AUTHORIZATION commands instead of\n"

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 241e29f149bc8ec1eca1f4507af15630c5e374eb..8c61d03a3f46cd9d1d55119873ceed6593cb6027 100644 (file)
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -76,7 +76,7 @@ main(int argc, char **argv)
    static int  no_data_for_failed_tables = 0;
    static int  outputNoTablespaces = 0;
    static int  use_setsessauth = 0;
-   static int  skip_seclabel = 0;
+   static int  no_security_labels = 0;
 
    struct option cmdopts[] = {
        {"clean", 0, NULL, 'c'},
@@ -117,7 +117,7 @@ main(int argc, char **argv)
        {"no-tablespaces", no_argument, &outputNoTablespaces, 1},
        {"role", required_argument, NULL, 2},
        {"use-set-session-authorization", no_argument, &use_setsessauth, 1},
-       {"no-security-label", no_argument, &skip_seclabel, 1},
+       {"no-security-labels", no_argument, &no_security_labels, 1},
 
        {NULL, 0, NULL, 0}
    };
@@ -318,7 +318,7 @@ main(int argc, char **argv)
    opts->noDataForFailedTables = no_data_for_failed_tables;
    opts->noTablespace = outputNoTablespaces;
    opts->use_setsessauth = use_setsessauth;
-   opts->skip_seclabel = skip_seclabel;
+   opts->no_security_labels = no_security_labels;
 
    if (opts->formatName)
    {
@@ -429,7 +429,7 @@ usage(const char *progname)
             "                           do not restore data of tables that could not be\n"
             "                           created\n"));
    printf(_("  --no-tablespaces         do not restore tablespace assignments\n"));
-   printf(_("  --no-security-label      do not restore security labels\n"));
+   printf(_("  --no-security-labels     do not restore security labels\n"));
    printf(_("  --role=ROLENAME          do SET ROLE before restore\n"));
    printf(_("  --use-set-session-authorization\n"
             "                           use SET SESSION AUTHORIZATION commands instead of\n"