rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow using connection URI in primary_conninfo. 

The old method of appending options to the connection string didn't work if
the primary_conninfo was a postgres:// style URI, instead of a traditional
connection string. Use PQconnectdbParams instead.

Alex Shulgin
This commit is contained in:
Heikki Linnakangas 2014-11-25 18:24:07 +02:00
parent add1b052e2
commit b3fc6727ce
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
View File

@ -89,18 +89,28 @@ _PG_init(void)
static void
libpqrcv_connect(char *conninfo)
{
char conninfo_repl[MAXCONNINFO + 75];
const char *keys[5];
const char *vals[5];
/*
* Connect using deliberately undocumented parameter: replication. The
* database name is ignored by the server in replication mode, but specify
* "replication" for .pgpass lookup.
* We use the expand_dbname parameter to process the connection string
* (or URI), and pass some extra options. The deliberately undocumented
* parameter "replication=true" makes it a replication connection.
* The database name is ignored by the server in replication mode, but
* specify "replication" for .pgpass lookup.
*/
snprintf(conninfo_repl, sizeof(conninfo_repl),
"%s dbname=replication replication=true fallback_application_name=walreceiver",
conninfo);
keys[0] = "dbname";
vals[0] = conninfo;
keys[1] = "replication";
vals[1] = "true";
keys[2] = "dbname";
vals[2] = "replication";
keys[3] = "fallback_application_name";
vals[3] = "walreceiver";
keys[4] = NULL;
vals[4] = NULL;
streamConn = PQconnectdb(conninfo_repl);
streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true);
if (PQstatus(streamConn) != CONNECTION_OK)
ereport(ERROR,
(errmsg("could not connect to the primary server: %s",