X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Fexception%2FDBQueryError.php;h=0be08cdb07e4a95705e6a5e905fb2161c05770b2;hb=138298b397b308ad6e4bfc7088884d90e8ac1e37;hp=a8ea3ade4218c5d14da0811282b72096f7a932a3;hpb=852cb0f6a821637801ed78d4aa53c6d02f67ccd2;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/libs/rdbms/exception/DBQueryError.php b/includes/libs/rdbms/exception/DBQueryError.php index a8ea3ade42..0be08cdb07 100644 --- a/includes/libs/rdbms/exception/DBQueryError.php +++ b/includes/libs/rdbms/exception/DBQueryError.php @@ -40,19 +40,22 @@ class DBQueryError extends DBExpectedError { * @param int|string $errno * @param string $sql * @param string $fname + * @param string $message Optional message, intended for subclases (optional) */ - public function __construct( IDatabase $db, $error, $errno, $sql, $fname ) { - if ( $db instanceof Database && $db->wasConnectionError( $errno ) ) { - $message = "A connection error occured. \n" . - "Query: $sql\n" . - "Function: $fname\n" . - "Error: $errno $error\n"; - } else { - $message = "A database query error has occurred. Did you forget to run " . - "your application's database schema updater after upgrading? \n" . - "Query: $sql\n" . - "Function: $fname\n" . - "Error: $errno $error\n"; + public function __construct( IDatabase $db, $error, $errno, $sql, $fname, $message = null ) { + if ( $message === null ) { + if ( $db instanceof Database && $db->wasConnectionError( $errno ) ) { + $message = "A connection error occured. \n" . + "Query: $sql\n" . + "Function: $fname\n" . + "Error: $errno $error\n"; + } else { + $message = "A database query error has occurred. Did you forget to run " . + "your application's database schema updater after upgrading? \n" . + "Query: $sql\n" . + "Function: $fname\n" . + "Error: $errno $error\n"; + } } parent::__construct( $db, $message ); @@ -64,4 +67,7 @@ class DBQueryError extends DBExpectedError { } } +/** + * @deprecated since 1.29 + */ class_alias( DBQueryError::class, 'DBQueryError' );