Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9240589

Browse files
committed
Fix pg_regress to print the correct postmaster address on Windows.
pg_regress reported "Unix socket" as the default location wheneverHAVE_UNIX_SOCKETS is defined. However, that's not been accurateon Windows since8f3ec75. Update this logic to match what libpqactually does now.This is just cosmetic, but still it's potentially misleading.Back-patch to v13 where8f3ec75 came in.Discussion:https://postgr.es/m/3894060.1646415641@sss.pgh.pa.us
1 parent791b1b7 commit9240589

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

‎src/interfaces/libpq/fe-connect.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,6 +1115,11 @@ connectOptions2(PGconn *conn)
11151115
{
11161116
if (ch->host)
11171117
free(ch->host);
1118+
1119+
/*
1120+
* This bit selects the default host location. If you change
1121+
* this, see also pg_regress.
1122+
*/
11181123
#ifdefHAVE_UNIX_SOCKETS
11191124
if (DEFAULT_PGSOCKET_DIR[0])
11201125
{

‎src/test/regress/pg_regress.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,10 +746,16 @@ initialize_environment(void)
746746
*/
747747
pghost=getenv("PGHOST");
748748
pgport=getenv("PGPORT");
749-
#ifndefHAVE_UNIX_SOCKETS
750749
if (!pghost)
751-
pghost="localhost";
750+
{
751+
/* Keep this bit in sync with libpq's default host location: */
752+
#ifdefHAVE_UNIX_SOCKETS
753+
if (DEFAULT_PGSOCKET_DIR[0])
754+
/* do nothing, we'll print "Unix socket" below */ ;
755+
else
752756
#endif
757+
pghost="localhost";/* DefaultHost in fe-connect.c */
758+
}
753759

754760
if (pghost&&pgport)
755761
printf(_("(using postmaster on %s, port %s)\n"),pghost,pgport);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp