database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-21 16:02:15 +03:00
Code Activity

Re-classify ERRCODE_DATABASE_DROPPED to 57P04

Browse Source
This commit is contained in:
Simon Riggs
2011-02-01 08:44:01 +00:00
parent 0c707aa458
commit 56b21b7ae3
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doc/src/sgml/errcodes.sgml
View File

@ -985,11 +985,6 @@
<entry>deadlock_detected</entry> <entry>deadlock_detected</entry>
</row> </row>
<row>
<entry><literal>40P02</literal></entry>
<entry>DATABASE DROPPED</entry>
<entry>database_dropped</entry>
</row>
<row> <row>
<entry spanname="span13"><emphasis role="bold">Class 42 &mdash; Syntax Error or Access Rule Violation</></entry> <entry spanname="span13"><emphasis role="bold">Class 42 &mdash; Syntax Error or Access Rule Violation</></entry>
@ -1374,6 +1369,12 @@
<entry>cannot_connect_now</entry> <entry>cannot_connect_now</entry>
</row> </row>
<row>
<entry><literal>57P04</literal></entry>
<entry>DATABASE DROPPED</entry>
<entry>database_dropped</entry>
</row>
<row> <row>
<entry spanname="span13"><emphasis role="bold">Class 58 &mdash; System Error (errors external to <productname>PostgreSQL</> itself)</></entry> <entry spanname="span13"><emphasis role="bold">Class 58 &mdash; System Error (errors external to <productname>PostgreSQL</> itself)</></entry>

2
src/backend/tcop/postgres.c
View File

@ -2916,7 +2916,7 @@ ProcessInterrupts(void)
Assert(RecoveryConflictReason == PROCSIG_RECOVERY_CONFLICT_DATABASE); Assert(RecoveryConflictReason == PROCSIG_RECOVERY_CONFLICT_DATABASE);
pgstat_report_recovery_conflict(RecoveryConflictReason); pgstat_report_recovery_conflict(RecoveryConflictReason);
ereport(FATAL, ereport(FATAL,
(errcode(ERRCODE_T_R_DATABASE_DROPPED), (errcode(ERRCODE_DATABASE_DROPPED),
errmsg("terminating connection due to conflict with recovery"), errmsg("terminating connection due to conflict with recovery"),
errdetail_recovery_conflict())); errdetail_recovery_conflict()));
} }

2
src/include/utils/errcodes.h
View File

@ -243,7 +243,6 @@
#define ERRCODE_T_R_SERIALIZATION_FAILURE MAKE_SQLSTATE('4','0', '0','0','1') #define ERRCODE_T_R_SERIALIZATION_FAILURE MAKE_SQLSTATE('4','0', '0','0','1')
#define ERRCODE_T_R_STATEMENT_COMPLETION_UNKNOWN MAKE_SQLSTATE('4','0', '0','0','3') #define ERRCODE_T_R_STATEMENT_COMPLETION_UNKNOWN MAKE_SQLSTATE('4','0', '0','0','3')
#define ERRCODE_T_R_DEADLOCK_DETECTED MAKE_SQLSTATE('4','0', 'P','0','1') #define ERRCODE_T_R_DEADLOCK_DETECTED MAKE_SQLSTATE('4','0', 'P','0','1')
#define ERRCODE_T_R_DATABASE_DROPPED MAKE_SQLSTATE('4','0', 'P','0','2')
/* Class 42 - Syntax Error or Access Rule Violation */ /* Class 42 - Syntax Error or Access Rule Violation */
#define ERRCODE_SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION MAKE_SQLSTATE('4','2', '0','0','0') #define ERRCODE_SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION MAKE_SQLSTATE('4','2', '0','0','0')
@ -333,6 +332,7 @@
#define ERRCODE_ADMIN_SHUTDOWN MAKE_SQLSTATE('5','7', 'P','0','1') #define ERRCODE_ADMIN_SHUTDOWN MAKE_SQLSTATE('5','7', 'P','0','1')
#define ERRCODE_CRASH_SHUTDOWN MAKE_SQLSTATE('5','7', 'P','0','2') #define ERRCODE_CRASH_SHUTDOWN MAKE_SQLSTATE('5','7', 'P','0','2')
#define ERRCODE_CANNOT_CONNECT_NOW MAKE_SQLSTATE('5','7', 'P','0','3') #define ERRCODE_CANNOT_CONNECT_NOW MAKE_SQLSTATE('5','7', 'P','0','3')
#define ERRCODE_DATABASE_DROPPED MAKE_SQLSTATE('5','7', 'P','0','4')
/* Class 58 - System Error (class borrowed from DB2) */ /* Class 58 - System Error (class borrowed from DB2) */
/* (we define this as errors external to PostgreSQL itself) */ /* (we define this as errors external to PostgreSQL itself) */

8
src/pl/plpgsql/src/plerrcodes.h
View File

@ -483,10 +483,6 @@
"deadlock_detected", ERRCODE_T_R_DEADLOCK_DETECTED "deadlock_detected", ERRCODE_T_R_DEADLOCK_DETECTED
}, },
{
"database_dropped", ERRCODE_T_R_DATABASE_DROPPED
},
{ {
"syntax_error_or_access_rule_violation", ERRCODE_SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION "syntax_error_or_access_rule_violation", ERRCODE_SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION
}, },
@ -739,6 +735,10 @@
"cannot_connect_now", ERRCODE_CANNOT_CONNECT_NOW "cannot_connect_now", ERRCODE_CANNOT_CONNECT_NOW
}, },
{
"database_dropped", ERRCODE_DATABASE_DROPPED
},
{ {
"io_error", ERRCODE_IO_ERROR "io_error", ERRCODE_IO_ERROR
}, },