database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

pg_ctl, pg_upgrade: allow multiple -o/-O options, append them

Browse Source 
Report by Pavel Raiskup
This commit is contained in:
Bruce Momjian
2014-08-25 16:30:26 -04:00
parent bf1c866597
commit ebe30ad59b
5 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/pg_upgrade/option.c
View File

@ -137,17 +137,35 @@ parseCommandLine(int argc, char *argv[])
break;
case 'o':
/* append option? */
if (!old_cluster.pgopts)
old_cluster.pgopts = pg_strdup(optarg);
else
{
char *old_pgopts = old_cluster.pgopts;
old_cluster.pgopts = psprintf("%s %s", old_pgopts, optarg);
free(old_pgopts);
}
break;
case 'O':
/* append option? */
if (!new_cluster.pgopts)
new_cluster.pgopts = pg_strdup(optarg);
else
{
char *new_pgopts = new_cluster.pgopts;
new_cluster.pgopts = psprintf("%s %s", new_pgopts, optarg);
free(new_pgopts);
}
break;
/*
* Someday, the port number option could be removed and passed
* using -o/-O, but that requires postmaster -C to be
* supported on all old/new versions.
* supported on all old/new versions (added in PG 9.2).
*/
case 'p':
if ((old_cluster.port = atoi(optarg)) <= 0)

6
doc/src/sgml/pgupgrade.sgml
View File

@ -130,14 +130,16 @@
<term><option>-o</option> <replaceable class="parameter">options</replaceable></term>
<term><option>--old-options</option> <replaceable class="parameter">options</replaceable></term>
<listitem><para>options to be passed directly to the
old <command>postgres</command> command</para></listitem>
old <command>postgres</command> command; multiple
option invocations are appended</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-O</option> <replaceable class="parameter">options</replaceable></term>
<term><option>--new-options</option> <replaceable class="parameter">options</replaceable></term>
<listitem><para>options to be passed directly to the
new <command>postgres</command> command</para></listitem>
new <command>postgres</command> command; multiple
option invocations are appended</para></listitem>
</varlistentry>
<varlistentry>

3
doc/src/sgml/ref/pg_ctl-ref.sgml
View File

@ -302,7 +302,8 @@ PostgreSQL documentation
<listitem>
<para>
Specifies options to be passed directly to the
<command>postgres</command> command.
<command>postgres</command> command; multiple
option invocations are appended.
</para>
<para>
The options should usually be surrounded by single or double

3
doc/src/sgml/ref/postgres-ref.sgml
View File

@ -288,7 +288,8 @@ PostgreSQL documentation
class="parameter">extra-options</replaceable> are passed to
all server processes started by this
<command>postgres</command> process. If the option string contains
any spaces, the entire string must be quoted.
any spaces, the entire string must be quoted; multiple
option invocations are appended.
</para>
<para>

9
src/bin/pg_ctl/pg_ctl.c
View File

@ -2184,7 +2184,16 @@ main(int argc, char **argv)
register_servicename = pg_strdup(optarg);
break;
case 'o':
/* append option? */
if (!post_opts)
post_opts = pg_strdup(optarg);
else
{
char *old_post_opts = post_opts;
post_opts = psprintf("%s %s", old_post_opts, optarg);
free(old_post_opts);
}
break;
case 'p':
exec_path = pg_strdup(optarg);