NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitea0aa96

committed

Improve dblink error message when remote does not provide it

When dblink or postgres_fdw detects an error on the remote side of theconnection, it will try to construct a local error message as best itcan using libpq's PQresultErrorField(). When no primary message isavailable, it was bailing out with an unhelpful "unknown error". Makethat message better and more style guide compliant. Per discussionon hackers.Backpatch to 9.2 except postgres_fdw which didn't exist before 9.3.Discussion:https://postgr.es/m/19872.1482338965%40sss.pgh.pa.us

1 parenta8ae123 commitea0aa96Copy full SHA for ea0aa96

File tree

2 files changed

-2

lines changed

contrib
- dblink
  - dblink.c
- postgres_fdw
  - connection.c

2 files changed

-2

lines changed

`‎contrib/dblink/dblink.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2705,7 +2705,7 @@ dblink_res_error(const char conname, PGresult res, const char *dblink_context_`
`2705`	`2705`	`ereport(level,`
`2706`	`2706`	`(errcode(sqlstate),`
`2707`	`2707`	`message_primary ?errmsg_internal("%s",message_primary) :`
`2708`		`-errmsg("unknown error"),`
	`2708`	`+errmsg("could not obtain message string for remote error"),`
`2709`	`2709`	`message_detail ?errdetail_internal("%s",message_detail) :0,`
`2710`	`2710`	`message_hint ?errhint("%s",message_hint) :0,`
`2711`	`2711`	`message_context ?errcontext("%s",message_context) :0,`

`‎contrib/postgres_fdw/connection.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ pgfdw_report_error(int elevel, PGresult res, PGconn conn,`
`568`	`568`	`ereport(elevel,`
`569`	`569`	`(errcode(sqlstate),`
`570`	`570`	`message_primary ?errmsg_internal("%s",message_primary) :`
`571`		`-errmsg("unknown error"),`
	`571`	`+errmsg("could not obtain message string for remote error"),`
`572`	`572`	`message_detail ?errdetail_internal("%s",message_detail) :0,`
`573`	`573`	`message_hint ?errhint("%s",message_hint) :0,`
`574`	`574`	`message_context ?errcontext("%s",message_context) :0,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitea0aa96

File tree

2 files changed

2 files changed

`‎contrib/dblink/dblink.c`

`‎contrib/postgres_fdw/connection.c`

0 commit comments