Handle dsn modification correctly

PJMODOS · PJMODOS · commit ee1b3a577fab · 2016-01-14T15:02:03.000+01:00
Fixes #59
diff --git a/expected/init_fail.out b/expected/init_fail.out
@@ -30,7 +30,7 @@ SELECT * FROM pglogical.create_subscription(
 	forward_origins := '{}');
 ERROR:  could not connect to the postgresql server: FATAL:  role "nonexisting" does not exist
 
-DETAIL:  dsn was: dbname=regression user=nonexisting fallback_application_name='create_subscription'
+DETAIL:  dsn was: dbname=regression user=nonexisting
 -- fail (remote node not existing)
 SELECT * FROM pglogical.create_subscription(
     subscription_name := 'test_subscription',
@@ -55,7 +55,7 @@ SELECT * FROM pglogical.create_subscription(
 	forward_origins := '{}');
 ERROR:  could not connect to the postgresql server in replication mode: FATAL:  no pg_hba.conf entry for replication connection from host "[local]", user "nonreplica"
 
-DETAIL:  dsn was: dbname=regression user=nonreplica replication=database fallback_application_name='create_subscription'
+DETAIL:  dsn was: dbname=regression user=nonreplica
 -- cleanup
 SELECT * FROM pglogical.drop_node('test_subscriber');
  drop_node 
diff --git a/pglogical.c b/pglogical.c
@@ -134,20 +134,27 @@ PGconn *
 pglogical_connect(const char *connstring, const char *connname)
 {
 	PGconn		   *conn;
-	StringInfoData	dsn;
+	const char	   *keys[3];
+	const char	   *vals[3];
 
-	initStringInfo(&dsn);
-	appendStringInfo(&dsn,
-					"%s fallback_application_name='%s'",
-					connstring, connname);
-
-	conn = PQconnectdb(dsn.data);
+	/*
+	 * We use the expand_dbname parameter to process the connection string
+	 * (or URI), and pass some extra options.
+	 */
+	keys[0] = "dbname";
+	vals[0] = connstring;
+	keys[1] = "fallback_application_name";
+	vals[1] = connname;
+	keys[2] = NULL;
+	vals[2] = NULL;
+
+	conn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true);
 	if (PQstatus(conn) != CONNECTION_OK)
 	{
 		ereport(ERROR,
 				(errmsg("could not connect to the postgresql server: %s",
 						PQerrorMessage(conn)),
-				 errdetail("dsn was: %s", dsn.data)));
+				 errdetail("dsn was: %s", connstring)));
 	}
 
 	return conn;
@@ -160,20 +167,29 @@ PGconn *
 pglogical_connect_replica(const char *connstring, const char *connname)
 {
 	PGconn		   *conn;
-	StringInfoData	dsn;
+	const char	   *keys[4];
+	const char	   *vals[4];
 
-	initStringInfo(&dsn);
-	appendStringInfo(&dsn,
-					"%s replication=database fallback_application_name='%s'",
-					connstring, connname);
-
-	conn = PQconnectdb(dsn.data);
+	/*
+	 * We use the expand_dbname parameter to process the connection string
+	 * (or URI), and pass some extra options.
+	 */
+	keys[0] = "dbname";
+	vals[0] = connstring;
+	keys[1] = "replication";
+	vals[1] = "database";
+	keys[2] = "fallback_application_name";
+	vals[2] = connname;
+	keys[3] = NULL;
+	vals[3] = NULL;
+
+	conn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true);
 	if (PQstatus(conn) != CONNECTION_OK)
 	{
 		ereport(ERROR,
 				(errmsg("could not connect to the postgresql server in replication mode: %s",
 						PQerrorMessage(conn)),
-				 errdetail("dsn was: %s", dsn.data)));
+				 errdetail("dsn was: %s", connstring)));
 	}
 
 	return conn;
