Fix pg_regress to print the correct postmaster address on Windows.

tglsfdc · tglsfdc · commit 9240589798e0 · 2022-03-04T13:23:58.000-05:00
pg_regress reported "Unix socket" as the default location whenever HAVE_UNIX_SOCKETS is defined. However, that's not been accurate on Windows since 8f3ec75. Update this logic to match what libpq actually does now. This is just cosmetic, but still it's potentially misleading. Back-patch to v13 where 8f3ec75 came in. Discussion: https://postgr.es/m/3894060.1646415641@sss.pgh.pa.us
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -1115,6 +1115,11 @@ connectOptions2(PGconn *conn)
 		{
 			if (ch->host)
 				free(ch->host);
+
+			/*
+			 * This bit selects the default host location.  If you change
+			 * this, see also pg_regress.
+			 */
 #ifdef HAVE_UNIX_SOCKETS
 			if (DEFAULT_PGSOCKET_DIR[0])
 			{
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
@@ -746,10 +746,16 @@ initialize_environment(void)
 		 */
 		pghost = getenv("PGHOST");
 		pgport = getenv("PGPORT");
-#ifndef HAVE_UNIX_SOCKETS
 		if (!pghost)
-			pghost = "localhost";
+		{
+			/* Keep this bit in sync with libpq's default host location: */
+#ifdef HAVE_UNIX_SOCKETS
+			if (DEFAULT_PGSOCKET_DIR[0])
+				 /* do nothing, we'll print "Unix socket" below */ ;
+			else
 #endif
+				pghost = "localhost";	/* DefaultHost in fe-connect.c */
+		}
 
 		if (pghost && pgport)
 			printf(_("(using postmaster on %s, port %s)\n"), pghost, pgport);

Original file line number	Diff line number	Diff line change
`@@ -1115,6 +1115,11 @@ connectOptions2(PGconn *conn)`
`1115`	`1115`	`{`
`1116`	`1116`	`if (ch->host)`
`1117`	`1117`	`free(ch->host);`
	`1118`	`+`
	`1119`	`+ /*`
	`1120`	`+ * This bit selects the default host location. If you change`
	`1121`	`+ * this, see also pg_regress.`
	`1122`	`+ */`
`1118`	`1123`	`#ifdef HAVE_UNIX_SOCKETS`
`1119`	`1124`	`if (DEFAULT_PGSOCKET_DIR[0])`
`1120`	`1125`	`{`