← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/postgresql-9.1/oneiric-updates

« back to all changes in this revision

Viewing changes to src/bin/pg_dump/pg_dumpall.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-06-14 09:53:29 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110614095329-kerawur7tb6p8s71
Tags: 9.1~beta2-1
* New upstream beta release.
* Drop 03-cmsgcred-size.patch, fixed upstream.
* debian/postgresql-9.1.install: Install new pg_basebackup translations.
* debian/control: Fix the server-dev dependency to p-common to also work for
  backports.
* debian/watch: Fix for beta versions.
* debian/copyright: Add pointers to GPL and Artistic licenses for the Perl
  terms.
* debian/postgresql-9.1.preinst: Fail the package upgrade early when
  upgrading from beta-1, as the DB format changed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/bin/pg_dump/pg_dumpall.c
69
69
static int      inserts = 0;
70
70
static int      no_tablespaces = 0;
71
71
static int      use_setsessauth = 0;
72
 
static int      no_security_label = 0;
 
72
static int      no_security_labels = 0;
73
73
static int      no_unlogged_table_data = 0;
74
74
static int      server_version;
75
75
 
134
134
                {"quote-all-identifiers", no_argument, &quote_all_identifiers, 1},
135
135
                {"role", required_argument, NULL, 3},
136
136
                {"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},
138
138
                {"no-unlogged-table-data", no_argument, &no_unlogged_table_data, 1},
139
139
 
140
140
                {NULL, 0, NULL, 0}
353
353
                appendPQExpBuffer(pgdumpopts, " --quote-all-identifiers");
354
354
        if (use_setsessauth)
355
355
                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");
358
358
        if (no_unlogged_table_data)
359
359
                appendPQExpBuffer(pgdumpopts, " --no-unlogged-table-data");
360
360
 
546
546
        printf(_("  -t, --tablespaces-only      dump only tablespaces, no databases or roles\n"));
547
547
        printf(_("  -x, --no-privileges         do not dump privileges (grant/revoke)\n"));
548
548
        printf(_("  --binary-upgrade            for use by upgrade utilities only\n"));
549
 
        printf(_("  --inserts                   dump data as INSERT commands, rather than COPY\n"));
550
549
        printf(_("  --column-inserts            dump data as INSERT commands with column names\n"));
551
550
        printf(_("  --disable-dollar-quoting    disable dollar quoting, use SQL standard quoting\n"));
552
551
        printf(_("  --disable-triggers          disable triggers during data-only restore\n"));
 
552
        printf(_("  --inserts                   dump data as INSERT commands, rather than COPY\n"));
 
553
        printf(_("  --no-security-labels        do not dump security label assignments\n"));
553
554
        printf(_("  --no-tablespaces            do not dump tablespace assignments\n"));
554
 
        printf(_("  --quote-all-identifiers     quote all identifiers, even if not keywords\n"));
555
 
        printf(_("  --role=ROLENAME             do SET ROLE before dump\n"));
556
 
        printf(_("  --no-security-label         do not dump security label assignments\n"));
557
 
        printf(_("  --no-unlogged-table-data    do not dump unlogged table data\n"));
 
555
        printf(_("  --no-unlogged-table-data    do not dump unlogged table data\n"));
 
556
        printf(_("  --quote-all-identifiers     quote all identifiers, even if not key words\n"));
558
557
        printf(_("  --use-set-session-authorization\n"
559
558
                         "                              use SET SESSION AUTHORIZATION commands instead of\n"
560
559
        "                              ALTER OWNER commands to set ownership\n"));
566
565
        printf(_("  -U, --username=NAME      connect as specified database user\n"));
567
566
        printf(_("  -w, --no-password        never prompt for password\n"));
568
567
        printf(_("  -W, --password           force password prompt (should happen automatically)\n"));
 
568
        printf(_("  --role=ROLENAME          do SET ROLE before dump\n"));
569
569
 
570
570
        printf(_("\nIf -f/--file is not used, then the SQL script will be written to the standard\n"
571
571
                         "output.\n\n"));