X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdb%2FDatabaseError.php;h=6453854a7b3606fc32577532df67e635295d9e09;hb=938cdc3a59d95ab775672eb15d30b906a06759df;hp=86950a89a9226d58be8052c5352086cfb41a57ce;hpb=ff05579d1c7fcf9d449bdd474b48338dd58b1c5d;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php index 86950a89a9..6453854a7b 100644 --- a/includes/db/DatabaseError.php +++ b/includes/db/DatabaseError.php @@ -329,12 +329,19 @@ class DBQueryError extends DBExpectedError { * @param string $fname */ function __construct( DatabaseBase $db, $error, $errno, $sql, $fname ) { - $message = "A database error has occurred. Did you forget to run " . - "maintenance/update.php after upgrading? See: " . - "https://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" . - "Query: $sql\n" . - "Function: $fname\n" . - "Error: $errno $error\n"; + if ( $db->wasConnectionError( $errno ) ) { + $message = "A connection error occured. \n" . + "Query: $sql\n" . + "Function: $fname\n" . + "Error: $errno $error\n"; + } else { + $message = "A database error has occurred. Did you forget to run " . + "maintenance/update.php after upgrading? See: " . + "https://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" . + "Query: $sql\n" . + "Function: $fname\n" . + "Error: $errno $error\n"; + } parent::__construct( $db, $message ); $this->error = $error; @@ -444,3 +451,9 @@ This may indicate a bug in the software.', */ class DBUnexpectedError extends DBError { } + +/** + * @ingroup Database + */ +class DBReadOnlyError extends DBError { +}