mirror of
https://github.com/postgres/postgres.git
synced 2025-11-19 13:42:17 +03:00
Rearrange the handling of error context reports.
Remove the code in plpgsql that suppressed the innermost line of CONTEXT for messages emitted by RAISE commands. That was never more than a quick backwards-compatibility hack, and it's pretty silly in cases where the RAISE is nested in several levels of function. What's more, it violated our design theory that verbosity of error reports should be controlled on the client side not the server side. To alleviate the resulting noise increase, introduce a feature in libpq and psql whereby the CONTEXT field of messages can be suppressed, either always or only for non-error messages. Printing CONTEXT for errors only is now their default behavior. The actual code changes here are pretty small, but the effects on the regression test outputs are widespread. I had to edit some of the alternative expected outputs by hand; hopefully the buildfarm will soon find anything I fat-fingered. In passing, fix up (again) the output line counts in psql's various help displays. Add some commentary about how to verify them. Pavel Stehule, reviewed by Petr Jelínek, Jeevan Chalke, and others
This commit is contained in:
@@ -110,6 +110,13 @@ typedef enum
|
||||
PQERRORS_VERBOSE /* all the facts, ma'am */
|
||||
} PGVerbosity;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
PQSHOW_CONTEXT_NEVER, /* never show CONTEXT field */
|
||||
PQSHOW_CONTEXT_ERRORS, /* show CONTEXT for errors only (default) */
|
||||
PQSHOW_CONTEXT_ALWAYS /* always show CONTEXT field */
|
||||
} PGContextVisibility;
|
||||
|
||||
/*
|
||||
* PGPing - The ordering of this enum should not be altered because the
|
||||
* values are exposed externally via pg_isready.
|
||||
@@ -337,6 +344,10 @@ extern void PQinitOpenSSL(int do_ssl, int do_crypto);
|
||||
/* Set verbosity for PQerrorMessage and PQresultErrorMessage */
|
||||
extern PGVerbosity PQsetErrorVerbosity(PGconn *conn, PGVerbosity verbosity);
|
||||
|
||||
/* Set CONTEXT visibility for PQerrorMessage and PQresultErrorMessage */
|
||||
extern PGContextVisibility PQsetErrorContextVisibility(PGconn *conn,
|
||||
PGContextVisibility show_context);
|
||||
|
||||
/* Enable/disable tracing */
|
||||
extern void PQtrace(PGconn *conn, FILE *debug_port);
|
||||
extern void PQuntrace(PGconn *conn);
|
||||
|
||||
Reference in New Issue
Block a user