Commit56b21b7

committed

Re-classify ERRCODE_DATABASE_DROPPED to 57P04

1 parent0c707aa commit56b21b7Copy full SHA for 56b21b7

File tree

+12

-11

lines changed

+12

-11

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -985,11 +985,6 @@`
`985`	`985`	`<entry>deadlock_detected</entry>`
`986`	`986`	`</row>`
`987`	`987`
`988`		`-<row>`
`989`		`-<entry><literal>40P02</literal></entry>`
`990`		`-<entry>DATABASE DROPPED</entry>`
`991`		`-<entry>database_dropped</entry>`
`992`		`-</row>`
`993`	`988`
`994`	`989`	`<row>`
`995`	`990`	`<entry spanname="span13"><emphasis role="bold">Class 42 — Syntax Error or Access Rule Violation</></entry>`
`@@ -1374,6 +1369,12 @@`
`1374`	`1369`	`<entry>cannot_connect_now</entry>`
`1375`	`1370`	`</row>`
`1376`	`1371`
	`1372`	`+<row>`
	`1373`	`+<entry><literal>57P04</literal></entry>`
	`1374`	`+<entry>DATABASE DROPPED</entry>`
	`1375`	`+<entry>database_dropped</entry>`
	`1376`	`+</row>`
	`1377`	`+`
`1377`	`1378`
`1378`	`1379`	`<row>`
`1379`	`1380`	`<entry spanname="span13"><emphasis role="bold">Class 58 — System Error (errors external to <productname>PostgreSQL</> itself)</></entry>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2916,7 +2916,7 @@ ProcessInterrupts(void)`
`2916`	`2916`	`Assert(RecoveryConflictReason==PROCSIG_RECOVERY_CONFLICT_DATABASE);`
`2917`	`2917`	`pgstat_report_recovery_conflict(RecoveryConflictReason);`
`2918`	`2918`	`ereport(FATAL,`
`2919`		`-(errcode(ERRCODE_T_R_DATABASE_DROPPED),`
	`2919`	`+(errcode(ERRCODE_DATABASE_DROPPED),`
`2920`	`2920`	`errmsg("terminating connection due to conflict with recovery"),`
`2921`	`2921`	`errdetail_recovery_conflict()));`
`2922`	`2922`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,6 @@`
`243`	`243`	`#defineERRCODE_T_R_SERIALIZATION_FAILUREMAKE_SQLSTATE('4','0', '0','0','1')`
`244`	`244`	`#defineERRCODE_T_R_STATEMENT_COMPLETION_UNKNOWNMAKE_SQLSTATE('4','0', '0','0','3')`
`245`	`245`	`#defineERRCODE_T_R_DEADLOCK_DETECTEDMAKE_SQLSTATE('4','0', 'P','0','1')`
`246`		`-#defineERRCODE_T_R_DATABASE_DROPPEDMAKE_SQLSTATE('4','0', 'P','0','2')`
`247`	`246`
`248`	`247`	`/* Class 42 - Syntax Error or Access Rule Violation */`
`249`	`248`	`#defineERRCODE_SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATIONMAKE_SQLSTATE('4','2', '0','0','0')`
`@@ -333,6 +332,7 @@`
`333`	`332`	`#defineERRCODE_ADMIN_SHUTDOWNMAKE_SQLSTATE('5','7', 'P','0','1')`
`334`	`333`	`#defineERRCODE_CRASH_SHUTDOWNMAKE_SQLSTATE('5','7', 'P','0','2')`
`335`	`334`	`#defineERRCODE_CANNOT_CONNECT_NOWMAKE_SQLSTATE('5','7', 'P','0','3')`
	`335`	`+#defineERRCODE_DATABASE_DROPPEDMAKE_SQLSTATE('5','7', 'P','0','4')`
`336`	`336`
`337`	`337`	`/* Class 58 - System Error (class borrowed from DB2) */`
`338`	`338`	`/* (we define this as errors external to PostgreSQL itself) */`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -483,10 +483,6 @@`
`483`	`483`	`"deadlock_detected",ERRCODE_T_R_DEADLOCK_DETECTED`
`484`	`484`	`},`
`485`	`485`
`486`		`-{`
`487`		`-"database_dropped",ERRCODE_T_R_DATABASE_DROPPED`
`488`		`-},`
`489`		`-`
`490`	`486`	`{`
`491`	`487`	`"syntax_error_or_access_rule_violation",ERRCODE_SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION`
`492`	`488`	`},`
`@@ -739,6 +735,10 @@`
`739`	`735`	`"cannot_connect_now",ERRCODE_CANNOT_CONNECT_NOW`
`740`	`736`	`},`
`741`	`737`
	`738`	`+{`
	`739`	`+"database_dropped",ERRCODE_DATABASE_DROPPED`
	`740`	`+},`
	`741`	`+`
`742`	`742`	`{`
`743`	`743`	`"io_error",ERRCODE_IO_ERROR`
`744`	`744`	`},`

Comments

(0)