aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/pg_dump/pg_dump.c23
-rw-r--r--src/bin/pg_dump/pg_dumpall.c24
-rw-r--r--src/bin/pg_dump/pg_restore.c20
3 files changed, 28 insertions, 39 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index fd91510683d..5cf0b76b50f 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
* by PostgreSQL
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.451 2006/10/06 17:14:00 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.452 2006/10/07 20:59:04 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -256,8 +256,7 @@ main(int argc, char **argv)
{"version", no_argument, NULL, 'V'},
/*
- * the following options don't have an equivalent short option letter,
- * but are available as '-X long-name'
+ * the following options don't have an equivalent short option letter
*/
{"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1},
{"disable-triggers", no_argument, &disable_triggers, 1},
@@ -432,14 +431,8 @@ main(int argc, char **argv)
aclsSkip = true;
break;
- /*
- * Option letters were getting scarce, so I invented this new
- * scheme: '-X feature' turns on some feature. Compare to the
- * -f option in GCC. You should also add an equivalent
- * GNU-style option --feature. Features that require
- * arguments should use '-X feature=foo'.
- */
case 'X':
+ /* -X is a deprecated alternative to long options */
if (strcmp(optarg, "disable-dollar-quoting") == 0)
disable_dollar_quoting = 1;
else if (strcmp(optarg, "disable-triggers") == 0)
@@ -459,9 +452,9 @@ main(int argc, char **argv)
case 'Z': /* Compression Level */
compressLevel = atoi(optarg);
break;
- /* This covers the long options equivalent to -X xxx. */
case 0:
+ /* This covers the long options equivalent to -X xxx. */
break;
default:
@@ -908,11 +901,9 @@ help(const char *progname)
printf(_(" -t, --table=TABLE dump the named table only\n"));
printf(_(" -T, --exclude-table=TABLE do NOT dump the named table\n"));
printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));
- printf(_(" -X disable-dollar-quoting, --disable-dollar-quoting\n"
- " disable dollar quoting, use SQL standard quoting\n"));
- printf(_(" -X disable-triggers, --disable-triggers\n"
- " disable triggers during data-only restore\n"));
- printf(_(" -X use-set-session-authorization, --use-set-session-authorization\n"
+ printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n"));
+ printf(_(" --disable-triggers disable triggers during data-only restore\n"));
+ printf(_(" --use-set-session-authorization\n"
" use SESSION AUTHORIZATION commands instead of\n"
" OWNER TO commands\n"));
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 1df5ee10fa6..d4181839fe9 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
*
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.83 2006/10/04 00:30:05 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.84 2006/10/07 20:59:05 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,7 +63,6 @@ static bool skip_acls = false;
static bool verbose = false;
static bool ignoreVersion = false;
-/* flags for -X long options */
static int disable_dollar_quoting = 0;
static int disable_triggers = 0;
static int use_setsessauth = 0;
@@ -107,8 +106,7 @@ main(int argc, char *argv[])
{"no-acl", no_argument, NULL, 'x'},
/*
- * the following options don't have an equivalent short option letter,
- * but are available as '-X long-name'
+ * the following options don't have an equivalent short option letter
*/
{"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1},
{"disable-triggers", no_argument, &disable_triggers, 1},
@@ -255,10 +253,11 @@ main(int argc, char *argv[])
break;
case 'X':
+ /* -X is a deprecated alternative to long options */
if (strcmp(optarg, "disable-dollar-quoting") == 0)
- appendPQExpBuffer(pgdumpopts, " -X disable-dollar-quoting");
+ appendPQExpBuffer(pgdumpopts, " --disable-dollar-quoting");
else if (strcmp(optarg, "disable-triggers") == 0)
- appendPQExpBuffer(pgdumpopts, " -X disable-triggers");
+ appendPQExpBuffer(pgdumpopts, " --disable-triggers");
else if (strcmp(optarg, "use-set-session-authorization") == 0)
/* no-op, still allowed for compatibility */ ;
else
@@ -282,11 +281,11 @@ main(int argc, char *argv[])
/* Add long options to the pg_dump argument list */
if (disable_dollar_quoting)
- appendPQExpBuffer(pgdumpopts, " -X disable-dollar-quoting");
+ appendPQExpBuffer(pgdumpopts, " --disable-dollar-quoting");
if (disable_triggers)
- appendPQExpBuffer(pgdumpopts, " -X disable-triggers");
+ appendPQExpBuffer(pgdumpopts, " --disable-triggers");
if (use_setsessauth)
- appendPQExpBuffer(pgdumpopts, " -X use-set-session-authorization");
+ appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization");
if (optind < argc)
{
@@ -388,11 +387,10 @@ help(void)
printf(_(" -s, --schema-only dump only the schema, no data\n"));
printf(_(" -S, --superuser=NAME specify the superuser user name to use in the dump\n"));
printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));
- printf(_(" -X disable-dollar-quoting, --disable-dollar-quoting\n"
+ printf(_(" --disable-dollar-quoting\n"
" disable dollar quoting, use SQL standard quoting\n"));
- printf(_(" -X disable-triggers, --disable-triggers\n"
- " disable triggers during data-only restore\n"));
- printf(_(" -X use-set-session-authorization, --use-set-session-authorization\n"
+ printf(_(" --disable-triggers disable triggers during data-only restore\n"));
+ printf(_(" --use-set-session-authorization\n"
" use SESSION AUTHORIZATION commands instead of\n"
" OWNER TO commands\n"));
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 2bbc86f6c7c..0c17c649e78 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.82 2006/10/06 17:14:00 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.83 2006/10/07 20:59:05 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -76,6 +76,7 @@ main(int argc, char **argv)
extern char *optarg;
static int use_setsessauth = 0;
static int disable_triggers = 0;
+ static int no_data_for_failed_tables = 0;
struct option cmdopts[] = {
{"clean", 0, NULL, 'c'},
@@ -107,11 +108,11 @@ main(int argc, char **argv)
{"single-transaction", 0, NULL, '1'},
/*
- * the following options don't have an equivalent short option letter,
- * but are available as '-X long-name'
+ * the following options don't have an equivalent short option letter
*/
{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
{"disable-triggers", no_argument, &disable_triggers, 1},
+ {"no-data-for-failed-tables", no_argument, &no_data_for_failed_tables, 1},
{NULL, 0, NULL, 0}
};
@@ -244,12 +245,11 @@ main(int argc, char **argv)
break;
case 'X':
+ /* -X is a deprecated alternative to long options */
if (strcmp(optarg, "use-set-session-authorization") == 0)
use_setsessauth = 1;
else if (strcmp(optarg, "disable-triggers") == 0)
disable_triggers = 1;
- else if (strcmp(optarg, "no-data-for-failed-tables") == 0)
- opts->noDataForFailedTables = 1;
else
{
fprintf(stderr,
@@ -260,8 +260,8 @@ main(int argc, char **argv)
}
break;
- /* This covers the long options equivalent to -X xxx. */
case 0:
+ /* This covers the long options equivalent to -X xxx. */
break;
case '1': /* Restore data in a single transaction */
@@ -296,6 +296,7 @@ main(int argc, char **argv)
opts->disable_triggers = disable_triggers;
opts->use_setsessauth = use_setsessauth;
+ opts->noDataForFailedTables = no_data_for_failed_tables;
if (opts->formatName)
{
@@ -390,12 +391,11 @@ usage(const char *progname)
printf(_(" -t, --table=NAME restore named table\n"));
printf(_(" -T, --trigger=NAME restore named trigger\n"));
printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n"));
- printf(_(" -X disable-triggers, --disable-triggers\n"
- " disable triggers during data-only restore\n"));
- printf(_(" -X use-set-session-authorization, --use-set-session-authorization\n"
+ printf(_(" --disable-triggers disable triggers during data-only restore\n"));
+ printf(_(" --use-set-session-authorization\n"
" use SESSION AUTHORIZATION commands instead of\n"
" OWNER TO commands\n"));
- printf(_(" -X no-data-for-failed-tables\n"
+ printf(_(" --no-data-for-failed-tables\n"
" do not restore data of tables that could not be\n"
" created\n"));
printf(_(" -1, --single-transaction\n"