diff options
| author | Bruce Momjian <bruce@momjian.us> | 2013-06-28 17:27:02 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2013-06-28 17:27:43 -0400 |
| commit | 457d6cf049c57cabe9b46ea13f26138040a214ec (patch) | |
| tree | 5e80011e2462512e97ab42fee68009e3980d772c | |
| parent | 5893ffa79c03824f34ae3d37f211381fd1c17283 (diff) | |
pg_upgrade: change -u to -U, for consistency
Change -u (user) option to -U, for consistency with other tools like
pg_dump and psql. Also expand --user to --username, again for
consistency.
BACKWARD INCOMPATIBILITY
| -rw-r--r-- | contrib/pg_upgrade/option.c | 8 | ||||
| -rw-r--r-- | doc/src/sgml/pgupgrade.sgml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c index 1459ca90966..a586b4e57a7 100644 --- a/contrib/pg_upgrade/option.c +++ b/contrib/pg_upgrade/option.c @@ -48,7 +48,7 @@ parseCommandLine(int argc, char *argv[]) {"old-port", required_argument, NULL, 'p'}, {"new-port", required_argument, NULL, 'P'}, - {"user", required_argument, NULL, 'u'}, + {"username", required_argument, NULL, 'U'}, {"check", no_argument, NULL, 'c'}, {"link", no_argument, NULL, 'k'}, {"retain", no_argument, NULL, 'r'}, @@ -102,7 +102,7 @@ parseCommandLine(int argc, char *argv[]) if ((log_opts.internal = fopen_priv(INTERNAL_LOG_FILE, "a")) == NULL) pg_log(PG_FATAL, "cannot write to log file %s\n", INTERNAL_LOG_FILE); - while ((option = getopt_long(argc, argv, "d:D:b:B:cj:ko:O:p:P:ru:v", + while ((option = getopt_long(argc, argv, "d:D:b:B:cj:ko:O:p:P:rU:v", long_options, &optindex)) != -1) { switch (option) @@ -170,7 +170,7 @@ parseCommandLine(int argc, char *argv[]) log_opts.retain = true; break; - case 'u': + case 'U': pg_free(os_info.user); os_info.user = pg_strdup(optarg); @@ -241,7 +241,7 @@ Options:\n\ -p, --old-port=OLDPORT old cluster port number (default %d)\n\ -P, --new-port=NEWPORT new cluster port number (default %d)\n\ -r, --retain retain SQL and log files after success\n\ - -u, --user=NAME cluster superuser (default \"%s\")\n\ + -U, --username=NAME cluster superuser (default \"%s\")\n\ -v, --verbose enable verbose internal logging\n\ -V, --version display version information, then exit\n\ -?, -h, --help show this help, then exit\n\ diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml index 62856f1df81..a8965656419 100644 --- a/doc/src/sgml/pgupgrade.sgml +++ b/doc/src/sgml/pgupgrade.sgml @@ -161,8 +161,8 @@ </varlistentry> <varlistentry> - <term><option>-u</option> <replaceable>user_name</></term> - <term><option>--user=</option><replaceable>user_name</></term> + <term><option>-U</option> <replaceable>user_name</></term> + <term><option>--username=</option><replaceable>user_name</></term> <listitem><para>cluster's super user name; environment variable <envar>PGUSER</></para></listitem> </varlistentry> |