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

Commitf89015b

Browse files
committed
postgres_fdw: Fix unexpected reporting of empty message.
pgfdw_report_error() in postgres_fdw gets a message from PGresult orPGconn to report an error received from a remote server. Previouslyif it could get a message from neither of them, it reported emptymessage unexpectedly. The cause of this issue was that pgfdw_report_error()didn't handle properly the case where no message could be obtainedand its local variable message_primary was set to '\0'.This commit improves pgfdw_report_error() so that it reports the message"could not obtain ..." when it gets no message and message_primaryis set to '\0'. This is the same behavior as when message_primary is NULL.dblink_res_error() in dblink has the same issue, so this commit alsoimproves it in the same way.Back-patch to all supported branches.Author: Fujii MasaoReviewed-by: Bharath RupireddyDiscussion:https://postgr.es/m/477c16c8-7ea4-20fc-38d5-ed3a77ed616c@oss.nttdata.com
1 parent6251f86 commitf89015b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

‎contrib/dblink/dblink.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2799,7 +2799,8 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res,
27992799

28002800
ereport(level,
28012801
(errcode(sqlstate),
2802-
message_primary ?errmsg_internal("%s",message_primary) :
2802+
(message_primary!=NULL&&message_primary[0]!='\0') ?
2803+
errmsg_internal("%s",message_primary) :
28032804
errmsg("could not obtain message string for remote error"),
28042805
message_detail ?errdetail_internal("%s",message_detail) :0,
28052806
message_hint ?errhint("%s",message_hint) :0,

‎contrib/postgres_fdw/connection.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,8 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn,
685685

686686
ereport(elevel,
687687
(errcode(sqlstate),
688-
message_primary ?errmsg_internal("%s",message_primary) :
688+
(message_primary!=NULL&&message_primary[0]!='\0') ?
689+
errmsg_internal("%s",message_primary) :
689690
errmsg("could not obtain message string for remote error"),
690691
message_detail ?errdetail_internal("%s",message_detail) :0,
691692
message_hint ?errhint("%s",message_hint) :0,

0 commit comments

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