X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fsql.php;h=8e276e77507b6ce4e15cb7e80fa2dbdde4805037;hb=5d743b03814d2e36abc45f0d9e048d6390b01084;hp=70f9aaad476a795be32fbe430d56d4ea5beb6418;hpb=b170b4a14a94fb509c4b15ca4c5717c6976a32cc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/sql.php b/maintenance/sql.php
index 70f9aaad47..8e276e7750 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -26,6 +26,7 @@ require_once __DIR__ . '/Maintenance.php';
 
 use Wikimedia\Rdbms\ResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\DBQueryError;
 
 /**
  * Maintenance script that sends SQL queries from the specified file to the database.
@@ -71,7 +72,7 @@ class MwSql extends Maintenance {
 				}
 			}
 			if ( $index === null ) {
-				$this->error( "No replica DB server configured with the name '$replicaDB'.", 1 );
+				$this->fatalError( "No replica DB server configured with the name '$replicaDB'." );
 			}
 		} else {
 			$index = DB_MASTER;
@@ -80,7 +81,7 @@ class MwSql extends Maintenance {
 		/** @var IDatabase $db DB handle for the appropriate cluster/wiki */
 		$db = $lb->getConnection( $index, [], $wiki );
 		if ( $replicaDB != '' && $db->getLBInfo( 'master' ) !== null ) {
-			$this->error( "The server selected ({$db->getServer()}) is not a replica DB.", 1 );
+			$this->fatalError( "The server selected ({$db->getServer()}) is not a replica DB." );
 		}
 
 		if ( $index === DB_MASTER ) {
@@ -91,12 +92,12 @@ class MwSql extends Maintenance {
 		if ( $this->hasArg( 0 ) ) {
 			$file = fopen( $this->getArg( 0 ), 'r' );
 			if ( !$file ) {
-				$this->error( "Unable to open input file", true );
+				$this->fatalError( "Unable to open input file" );
 			}
 
 			$error = $db->sourceStream( $file, null, [ $this, 'sqlPrintResult' ] );
 			if ( $error !== true ) {
-				$this->error( $error, true );
+				$this->fatalError( $error );
 			} else {
 				exit( 0 );
 			}
@@ -156,7 +157,11 @@ class MwSql extends Maintenance {
 			$res = $db->query( $line );
 			$this->sqlPrintResult( $res, $db );
 		} catch ( DBQueryError $e ) {
-			$this->error( $e, $dieOnError );
+			if ( $dieOnError ) {
+				$this->fatalError( $e );
+			} else {
+				$this->error( $e );
+			}
 		}
 	}