database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

pg_createsubscriber: Rename option --socket-directory to --socketdir

Browse Source 
For consistency with the equivalent option in pg_upgrade.

Reviewed-by: Hayato Kuroda <kuroda.hayato@fujitsu.com>
Reviewed-by: Euler Taveira <euler@eulerto.com>
Discussion: https://www.postgresql.org/message-id/flat/1ed82b9b-8e20-497d-a2f8-aebdd793d595%40eisentraut.org
This commit is contained in:
Peter Eisentraut 2024-08-01 12:09:56 +02:00
parent e66b32e43b
commit c671e142bf
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,7 @@ PostgreSQL documentation
<varlistentry> <varlistentry>
<term><option>-s <replaceable class="parameter">dir</replaceable></option></term> <term><option>-s <replaceable class="parameter">dir</replaceable></option></term>
<term><option>--socket-directory=<replaceable class="parameter">dir</replaceable></option></term> <term><option>--socketdir=<replaceable class="parameter">dir</replaceable></option></term>
<listitem> <listitem>
<para> <para>
The directory to use for postmaster sockets on target server. The The directory to use for postmaster sockets on target server. The

4
src/bin/pg_basebackup/pg_createsubscriber.c
View File

@ -226,7 +226,7 @@ usage(void)
printf(_(" -n, --dry-run dry run, just show what would be done\n")); printf(_(" -n, --dry-run dry run, just show what would be done\n"));
printf(_(" -p, --subscriber-port=PORT subscriber port number (default %s)\n"), DEFAULT_SUB_PORT); printf(_(" -p, --subscriber-port=PORT subscriber port number (default %s)\n"), DEFAULT_SUB_PORT);
printf(_(" -P, --publisher-server=CONNSTR publisher connection string\n")); printf(_(" -P, --publisher-server=CONNSTR publisher connection string\n"));
printf(_(" -s, --socket-directory=DIR socket directory to use (default current directory)\n")); printf(_(" -s, --socketdir=DIR socket directory to use (default current dir.)\n"));
printf(_(" -t, --recovery-timeout=SECS seconds to wait for recovery to end\n")); printf(_(" -t, --recovery-timeout=SECS seconds to wait for recovery to end\n"));
printf(_(" -U, --subscriber-username=NAME subscriber username\n")); printf(_(" -U, --subscriber-username=NAME subscriber username\n"));
printf(_(" -v, --verbose output verbose messages\n")); printf(_(" -v, --verbose output verbose messages\n"));
@ -1871,7 +1871,7 @@ main(int argc, char **argv)
{"dry-run", no_argument, NULL, 'n'}, {"dry-run", no_argument, NULL, 'n'},
{"subscriber-port", required_argument, NULL, 'p'}, {"subscriber-port", required_argument, NULL, 'p'},
{"publisher-server", required_argument, NULL, 'P'}, {"publisher-server", required_argument, NULL, 'P'},
{"socket-directory", required_argument, NULL, 's'}, {"socketdir", required_argument, NULL, 's'},
{"recovery-timeout", required_argument, NULL, 't'}, {"recovery-timeout", required_argument, NULL, 't'},
{"subscriber-username", required_argument, NULL, 'U'}, {"subscriber-username", required_argument, NULL, 'U'},
{"verbose", no_argument, NULL, 'v'}, {"verbose", no_argument, NULL, 'v'},

18
src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
View File

@ -171,7 +171,7 @@ command_fails(
'pg_createsubscriber', '--verbose', 'pg_createsubscriber', '--verbose',
'--dry-run', '--pgdata', '--dry-run', '--pgdata',
$node_t->data_dir, '--publisher-server', $node_t->data_dir, '--publisher-server',
$node_p->connstr($db1), '--socket-directory', $node_p->connstr($db1), '--socketdir',
$node_t->host, '--subscriber-port', $node_t->host, '--subscriber-port',
$node_t->port, '--database', $node_t->port, '--database',
$db1, '--database', $db1, '--database',
@ -185,7 +185,7 @@ command_fails(
'pg_createsubscriber', '--verbose', 'pg_createsubscriber', '--verbose',
'--dry-run', '--pgdata', '--dry-run', '--pgdata',
$node_s->data_dir, '--publisher-server', $node_s->data_dir, '--publisher-server',
$node_p->connstr($db1), '--socket-directory', $node_p->connstr($db1), '--socketdir',
$node_s->host, '--subscriber-port', $node_s->host, '--subscriber-port',
$node_s->port, '--database', $node_s->port, '--database',
$db1, '--database', $db1, '--database',
@ -199,7 +199,7 @@ command_fails(
'pg_createsubscriber', '--verbose', 'pg_createsubscriber', '--verbose',
'--pgdata', $node_f->data_dir, '--pgdata', $node_f->data_dir,
'--publisher-server', $node_p->connstr($db1), '--publisher-server', $node_p->connstr($db1),
'--socket-directory', $node_f->host, '--socketdir', $node_f->host,
'--subscriber-port', $node_f->port, '--subscriber-port', $node_f->port,
'--database', $db1, '--database', $db1,
'--database', $db2 '--database', $db2
@ -219,7 +219,7 @@ command_fails(
'pg_createsubscriber', '--verbose', 'pg_createsubscriber', '--verbose',
'--dry-run', '--pgdata', '--dry-run', '--pgdata',
$node_c->data_dir, '--publisher-server', $node_c->data_dir, '--publisher-server',
$node_s->connstr($db1), '--socket-directory', $node_s->connstr($db1), '--socketdir',
$node_c->host, '--subscriber-port', $node_c->host, '--subscriber-port',
$node_c->port, '--database', $node_c->port, '--database',
$db1, '--database', $db1, '--database',
@ -242,7 +242,7 @@ command_fails(
'pg_createsubscriber', '--verbose', 'pg_createsubscriber', '--verbose',
'--dry-run', '--pgdata', '--dry-run', '--pgdata',
$node_s->data_dir, '--publisher-server', $node_s->data_dir, '--publisher-server',
$node_p->connstr($db1), '--socket-directory', $node_p->connstr($db1), '--socketdir',
$node_s->host, '--subscriber-port', $node_s->host, '--subscriber-port',
$node_s->port, '--database', $node_s->port, '--database',
$db1, '--database', $db1, '--database',
@ -271,7 +271,7 @@ command_fails(
'pg_createsubscriber', '--verbose', 'pg_createsubscriber', '--verbose',
'--dry-run', '--pgdata', '--dry-run', '--pgdata',
$node_s->data_dir, '--publisher-server', $node_s->data_dir, '--publisher-server',
$node_p->connstr($db1), '--socket-directory', $node_p->connstr($db1), '--socketdir',
$node_s->host, '--subscriber-port', $node_s->host, '--subscriber-port',
$node_s->port, '--database', $node_s->port, '--database',
$db1, '--database', $db1, '--database',
@ -325,7 +325,7 @@ command_ok(
'--recovery-timeout', "$PostgreSQL::Test::Utils::timeout_default", '--recovery-timeout', "$PostgreSQL::Test::Utils::timeout_default",
'--dry-run', '--pgdata', '--dry-run', '--pgdata',
$node_s->data_dir, '--publisher-server', $node_s->data_dir, '--publisher-server',
$node_p->connstr($db1), '--socket-directory', $node_p->connstr($db1), '--socketdir',
$node_s->host, '--subscriber-port', $node_s->host, '--subscriber-port',
$node_s->port, '--publication', $node_s->port, '--publication',
'pub1', '--publication', 'pub1', '--publication',
@ -349,7 +349,7 @@ command_ok(
'pg_createsubscriber', '--verbose', 'pg_createsubscriber', '--verbose',
'--dry-run', '--pgdata', '--dry-run', '--pgdata',
$node_s->data_dir, '--publisher-server', $node_s->data_dir, '--publisher-server',
$node_p->connstr($db1), '--socket-directory', $node_p->connstr($db1), '--socketdir',
$node_s->host, '--subscriber-port', $node_s->host, '--subscriber-port',
$node_s->port, '--replication-slot', $node_s->port, '--replication-slot',
'replslot1' 'replslot1'
@ -363,7 +363,7 @@ command_ok(
'--recovery-timeout', "$PostgreSQL::Test::Utils::timeout_default", '--recovery-timeout', "$PostgreSQL::Test::Utils::timeout_default",
'--verbose', '--pgdata', '--verbose', '--pgdata',
$node_s->data_dir, '--publisher-server', $node_s->data_dir, '--publisher-server',
$node_p->connstr($db1), '--socket-directory', $node_p->connstr($db1), '--socketdir',
$node_s->host, '--subscriber-port', $node_s->host, '--subscriber-port',
$node_s->port, '--publication', $node_s->port, '--publication',
'pub1', '--publication', 'pub1', '--publication',