rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-28 03:21:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Other similar options also use the plural form.
This commit is contained in:
Peter Eisentraut 2011-05-19 23:20:11 +03:00
parent fcd4575905
commit c8e0c32119
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/sgml/ref/pg_dump.sgml
View File

@ -702,7 +702,7 @@ PostgreSQL documentation
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--no-security-label</option></term> <term><option>--no-security-labels</option></term>
<listitem> <listitem>
<para> <para>
Do not dump security labels. Do not dump security labels.

2
doc/src/sgml/ref/pg_dumpall.sgml
View File

@ -193,7 +193,7 @@ PostgreSQL documentation
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--no-security-label</option></term> <term><option>--no-security-labels</option></term>
<listitem> <listitem>
<para> <para>
Do not dump security labels. Do not dump security labels.

2
doc/src/sgml/ref/pg_restore.sgml
View File

@ -340,7 +340,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--no-security-label</option></term> <term><option>--no-security-labels</option></term>
<listitem> <listitem>
<para> <para>
Do not output commands to restore security labels, Do not output commands to restore security labels,

2
src/bin/pg_dump/pg_backup.h
View File

@ -104,7 +104,7 @@ typedef struct _restoreOptions
* restore */ * restore */
int use_setsessauth;/* Use SET SESSION AUTHORIZATION commands int use_setsessauth;/* Use SET SESSION AUTHORIZATION commands
* instead of OWNER TO */ * 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 *superuser; /* Username to use as superuser */
char *use_role; /* Issue SET ROLE to this */ char *use_role; /* Issue SET ROLE to this */
int dataOnly; int dataOnly;

2
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -2352,7 +2352,7 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt, bool include_acls)
return 0; return 0;
/* If it's security labels, maybe ignore it */ /* 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; return 0;
/* Ignore DATABASE entry unless we should create it */ /* Ignore DATABASE entry unless we should create it */

18
src/bin/pg_dump/pg_dump.c
View File

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

10
src/bin/pg_dump/pg_dumpall.c
View File

@ -69,7 +69,7 @@ static int disable_triggers = 0;
static int inserts = 0; static int inserts = 0;
static int no_tablespaces = 0; static int no_tablespaces = 0;
static int use_setsessauth = 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 no_unlogged_table_data = 0;
static int server_version; static int server_version;
@ -134,7 +134,7 @@ main(int argc, char *argv[])
{"quote-all-identifiers", no_argument, &quote_all_identifiers, 1}, {"quote-all-identifiers", no_argument, &quote_all_identifiers, 1},
{"role", required_argument, NULL, 3}, {"role", required_argument, NULL, 3},
{"use-set-session-authorization", no_argument, &use_setsessauth, 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}, {"no-unlogged-table-data", no_argument, &no_unlogged_table_data, 1},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
@ -353,8 +353,8 @@ main(int argc, char *argv[])
appendPQExpBuffer(pgdumpopts, " --quote-all-identifiers"); appendPQExpBuffer(pgdumpopts, " --quote-all-identifiers");
if (use_setsessauth) if (use_setsessauth)
appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization"); appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization");
if (no_security_label) if (no_security_labels)
appendPQExpBuffer(pgdumpopts, " --no-security-label"); appendPQExpBuffer(pgdumpopts, " --no-security-labels");
if (no_unlogged_table_data) if (no_unlogged_table_data)
appendPQExpBuffer(pgdumpopts, " --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(_(" --no-tablespaces do not dump tablespace assignments\n"));
printf(_(" --quote-all-identifiers quote all identifiers, even if not keywords\n")); printf(_(" --quote-all-identifiers quote all identifiers, even if not keywords\n"));
printf(_(" --role=ROLENAME do SET ROLE before dump\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(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
printf(_(" --use-set-session-authorization\n" printf(_(" --use-set-session-authorization\n"
" use SET SESSION AUTHORIZATION commands instead of\n" " use SET SESSION AUTHORIZATION commands instead of\n"

8
src/bin/pg_dump/pg_restore.c
View File

@ -76,7 +76,7 @@ main(int argc, char **argv)
static int no_data_for_failed_tables = 0; static int no_data_for_failed_tables = 0;
static int outputNoTablespaces = 0; static int outputNoTablespaces = 0;
static int use_setsessauth = 0; static int use_setsessauth = 0;
static int skip_seclabel = 0; static int no_security_labels = 0;
struct option cmdopts[] = { struct option cmdopts[] = {
{"clean", 0, NULL, 'c'}, {"clean", 0, NULL, 'c'},
@ -117,7 +117,7 @@ main(int argc, char **argv)
{"no-tablespaces", no_argument, &outputNoTablespaces, 1}, {"no-tablespaces", no_argument, &outputNoTablespaces, 1},
{"role", required_argument, NULL, 2}, {"role", required_argument, NULL, 2},
{"use-set-session-authorization", no_argument, &use_setsessauth, 1}, {"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} {NULL, 0, NULL, 0}
}; };
@ -318,7 +318,7 @@ main(int argc, char **argv)
opts->noDataForFailedTables = no_data_for_failed_tables; opts->noDataForFailedTables = no_data_for_failed_tables;
opts->noTablespace = outputNoTablespaces; opts->noTablespace = outputNoTablespaces;
opts->use_setsessauth = use_setsessauth; opts->use_setsessauth = use_setsessauth;
opts->skip_seclabel = skip_seclabel; opts->no_security_labels = no_security_labels;
if (opts->formatName) if (opts->formatName)
{ {
@ -429,7 +429,7 @@ usage(const char *progname)
" do not restore data of tables that could not be\n" " do not restore data of tables that could not be\n"
" created\n")); " created\n"));
printf(_(" --no-tablespaces do not restore tablespace assignments\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(_(" --role=ROLENAME do SET ROLE before restore\n"));
printf(_(" --use-set-session-authorization\n" printf(_(" --use-set-session-authorization\n"
" use SET SESSION AUTHORIZATION commands instead of\n" " use SET SESSION AUTHORIZATION commands instead of\n"