sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-13 01:13:08 -04:00
Code Issues Projects Releases Wiki Activity

Fix compile failure.

Browse Source 
I forgot that some compilers won't handle #if constructs within
ereport() calls.  Duplicating most of the call is annoying but simple.
Per buildfarm.
This commit is contained in:
Tom Lane 2020-02-24 18:43:23 -05:00
parent 2742c45080
commit 36390713a6
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/dblink/dblink.c
View File

@ -207,16 +207,21 @@ dblink_get_conn(char *conname_or_str,
* ensures that VFDs are closed if needed to make room.) * ensures that VFDs are closed if needed to make room.)
*/ */
if (!AcquireExternalFD()) if (!AcquireExternalFD())
{
#ifndef WIN32 /* can't write #if within ereport() macro */
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"), errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."), errdetail("There are too many open files on the local server."),
#ifndef WIN32 errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")));
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")
#else #else
errhint("Raise the server's max_files_per_process setting.") ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."),
errhint("Raise the server's max_files_per_process setting.")));
#endif #endif
)); }
/* OK to make connection */ /* OK to make connection */
conn = PQconnectdb(connstr); conn = PQconnectdb(connstr);
@ -310,16 +315,21 @@ dblink_connect(PG_FUNCTION_ARGS)
* that VFDs are closed if needed to make room.) * that VFDs are closed if needed to make room.)
*/ */
if (!AcquireExternalFD()) if (!AcquireExternalFD())
{
#ifndef WIN32 /* can't write #if within ereport() macro */
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"), errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."), errdetail("There are too many open files on the local server."),
#ifndef WIN32 errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")));
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")
#else #else
errhint("Raise the server's max_files_per_process setting.") ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."),
errhint("Raise the server's max_files_per_process setting.")));
#endif #endif
)); }
/* OK to make connection */ /* OK to make connection */
conn = PQconnectdb(connstr); conn = PQconnectdb(connstr);

14
contrib/postgres_fdw/connection.c
View File

@ -269,17 +269,23 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
* ensures that VFDs are closed if needed to make room.) * ensures that VFDs are closed if needed to make room.)
*/ */
if (!AcquireExternalFD()) if (!AcquireExternalFD())
{
#ifndef WIN32 /* can't write #if within ereport() macro */
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not connect to server \"%s\"", errmsg("could not connect to server \"%s\"",
server->servername), server->servername),
errdetail("There are too many open files on the local server."), errdetail("There are too many open files on the local server."),
#ifndef WIN32 errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")));
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")
#else #else
errhint("Raise the server's max_files_per_process setting.") ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not connect to server \"%s\"",
server->servername),
errdetail("There are too many open files on the local server."),
errhint("Raise the server's max_files_per_process setting.")));
#endif #endif
)); }
/* OK to make connection */ /* OK to make connection */
conn = PQconnectdbParams(keywords, values, false); conn = PQconnectdbParams(keywords, values, false);