Skip to content

Commit c8e0c32

Browse files
peterepetere
committed
Rename pg_dump --no-security-label to --no-security-labels
Other similar options also use the plural form.
1 parent fcd4575 commit c8e0c32

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

‎doc/src/sgml/ref/pg_dump.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ PostgreSQL documentation
702702
</varlistentry>
703703

704704
<varlistentry>
705-
<term><option>--no-security-label</option></term>
705+
<term><option>--no-security-labels</option></term>
706706
<listitem>
707707
<para>
708708
Do not dump security labels.

‎doc/src/sgml/ref/pg_dumpall.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ PostgreSQL documentation
193193
</varlistentry>
194194

195195
<varlistentry>
196-
<term><option>--no-security-label</option></term>
196+
<term><option>--no-security-labels</option></term>
197197
<listitem>
198198
<para>
199199
Do not dump security labels.

‎doc/src/sgml/ref/pg_restore.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@
340340
</varlistentry>
341341

342342
<varlistentry>
343-
<term><option>--no-security-label</option></term>
343+
<term><option>--no-security-labels</option></term>
344344
<listitem>
345345
<para>
346346
Do not output commands to restore security labels,

‎src/bin/pg_dump/pg_backup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ typedef struct _restoreOptions
104104
* restore */
105105
int use_setsessauth;/* Use SET SESSION AUTHORIZATION commands
106106
* instead of OWNER TO */
107-
int skip_seclabel; /* Skip security label entries */
107+
int no_security_labels; /* Skip security label entries */
108108
char *superuser; /* Username to use as superuser */
109109
char *use_role; /* Issue SET ROLE to this */
110110
int dataOnly;

‎src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2352,7 +2352,7 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt, bool include_acls)
23522352
return 0;
23532353

23542354
/* If it's security labels, maybe ignore it */
2355-
if (ropt->skip_seclabel && strcmp(te->desc, "SECURITY LABEL") == 0)
2355+
if (ropt->no_security_labels && strcmp(te->desc, "SECURITY LABEL") == 0)
23562356
return 0;
23572357

23582358
/* Ignore DATABASE entry unless we should create it */

‎src/bin/pg_dump/pg_dump.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static int binary_upgrade = 0;
135135
static int disable_dollar_quoting = 0;
136136
static int dump_inserts = 0;
137137
static int column_inserts = 0;
138-
static int no_security_label = 0;
138+
static int no_security_labels = 0;
139139
static int no_unlogged_table_data = 0;
140140
static int serializable_deferrable = 0;
141141

@@ -329,7 +329,7 @@ main(int argc, char **argv)
329329
{"role", required_argument, NULL, 3},
330330
{"serializable-deferrable", no_argument, &serializable_deferrable, 1},
331331
{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
332-
{"no-security-label", no_argument, &no_security_label, 1},
332+
{"no-security-labels", no_argument, &no_security_labels, 1},
333333
{"no-unlogged-table-data", no_argument, &no_unlogged_table_data, 1},
334334

335335
{NULL, 0, NULL, 0}
@@ -651,8 +651,8 @@ main(int argc, char **argv)
651651
/*
652652
* Disables security label support if server version < v9.1.x
653653
*/
654-
if (!no_security_label && g_fout->remoteVersion < 90100)
655-
no_security_label = 1;
654+
if (!no_security_labels && g_fout->remoteVersion < 90100)
655+
no_security_labels = 1;
656656

657657
/*
658658
* Start transaction-snapshot mode transaction to dump consistent data.
@@ -862,7 +862,7 @@ help(const char *progname)
862862
printf(_(" --quote-all-identifiers quote all identifiers, even if not keywords\n"));
863863
printf(_(" --serializable-deferrable wait until the dump can run without anomalies\n"));
864864
printf(_(" --role=ROLENAME do SET ROLE before dump\n"));
865-
printf(_(" --no-security-label do not dump security label assignments\n"));
865+
printf(_(" --no-security-labels do not dump security label assignments\n"));
866866
printf(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
867867
printf(_(" --use-set-session-authorization\n"
868868
" use SET SESSION AUTHORIZATION commands instead of\n"
@@ -11535,8 +11535,8 @@ dumpSecLabel(Archive *fout, const char *target,
1153511535
int i;
1153611536
PQExpBuffer query;
1153711537

11538-
/* do nothing, if --no-security-label is supplied */
11539-
if (no_security_label)
11538+
/* do nothing, if --no-security-labels is supplied */
11539+
if (no_security_labels)
1154011540
return;
1154111541

1154211542
/* Comments are schema not data ... except blob comments are data */
@@ -11598,8 +11598,8 @@ dumpTableSecLabel(Archive *fout, TableInfo *tbinfo, const char *reltypename)
1159811598
PQExpBuffer query;
1159911599
PQExpBuffer target;
1160011600

11601-
/* do nothing, if --no-security-label is supplied */
11602-
if (no_security_label)
11601+
/* do nothing, if --no-security-labels is supplied */
11602+
if (no_security_labels)
1160311603
return;
1160411604

1160511605
/* SecLabel are SCHEMA not data */

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static int disable_triggers = 0;
6969
static int inserts = 0;
7070
static int no_tablespaces = 0;
7171
static int use_setsessauth = 0;
72-
static int no_security_label = 0;
72+
static int no_security_labels = 0;
7373
static int no_unlogged_table_data = 0;
7474
static int server_version;
7575

@@ -134,7 +134,7 @@ main(int argc, char *argv[])
134134
{"quote-all-identifiers", no_argument, &quote_all_identifiers, 1},
135135
{"role", required_argument, NULL, 3},
136136
{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
137-
{"no-security-label", no_argument, &no_security_label, 1},
137+
{"no-security-labels", no_argument, &no_security_labels, 1},
138138
{"no-unlogged-table-data", no_argument, &no_unlogged_table_data, 1},
139139

140140
{NULL, 0, NULL, 0}
@@ -353,8 +353,8 @@ main(int argc, char *argv[])
353353
appendPQExpBuffer(pgdumpopts, " --quote-all-identifiers");
354354
if (use_setsessauth)
355355
appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization");
356-
if (no_security_label)
357-
appendPQExpBuffer(pgdumpopts, " --no-security-label");
356+
if (no_security_labels)
357+
appendPQExpBuffer(pgdumpopts, " --no-security-labels");
358358
if (no_unlogged_table_data)
359359
appendPQExpBuffer(pgdumpopts, " --no-unlogged-table-data");
360360

@@ -553,7 +553,7 @@ help(void)
553553
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
554554
printf(_(" --quote-all-identifiers quote all identifiers, even if not keywords\n"));
555555
printf(_(" --role=ROLENAME do SET ROLE before dump\n"));
556-
printf(_(" --no-security-label do not dump security label assignments\n"));
556+
printf(_(" --no-security-labels do not dump security label assignments\n"));
557557
printf(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
558558
printf(_(" --use-set-session-authorization\n"
559559
" use SET SESSION AUTHORIZATION commands instead of\n"

‎src/bin/pg_dump/pg_restore.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ main(int argc, char **argv)
7676
static int no_data_for_failed_tables = 0;
7777
static int outputNoTablespaces = 0;
7878
static int use_setsessauth = 0;
79-
static int skip_seclabel = 0;
79+
static int no_security_labels = 0;
8080

8181
struct option cmdopts[] = {
8282
{"clean", 0, NULL, 'c'},
@@ -117,7 +117,7 @@ main(int argc, char **argv)
117117
{"no-tablespaces", no_argument, &outputNoTablespaces, 1},
118118
{"role", required_argument, NULL, 2},
119119
{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
120-
{"no-security-label", no_argument, &skip_seclabel, 1},
120+
{"no-security-labels", no_argument, &no_security_labels, 1},
121121

122122
{NULL, 0, NULL, 0}
123123
};
@@ -318,7 +318,7 @@ main(int argc, char **argv)
318318
opts->noDataForFailedTables = no_data_for_failed_tables;
319319
opts->noTablespace = outputNoTablespaces;
320320
opts->use_setsessauth = use_setsessauth;
321-
opts->skip_seclabel = skip_seclabel;
321+
opts->no_security_labels = no_security_labels;
322322

323323
if (opts->formatName)
324324
{
@@ -429,7 +429,7 @@ usage(const char *progname)
429429
" do not restore data of tables that could not be\n"
430430
" created\n"));
431431
printf(_(" --no-tablespaces do not restore tablespace assignments\n"));
432-
printf(_(" --no-security-label do not restore security labels\n"));
432+
printf(_(" --no-security-labels do not restore security labels\n"));
433433
printf(_(" --role=ROLENAME do SET ROLE before restore\n"));
434434
printf(_(" --use-set-session-authorization\n"
435435
" use SET SESSION AUTHORIZATION commands instead of\n"

0 commit comments

Comments
 (0)