X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fsql.php;h=e6a30a38fe5a087ee28c8fe07e898b7ee7b605d9;hb=ef50d30b7b8e3b6f8480b74135f2f2e30f479336;hp=f0899729b92ead91971c58323d599e7070777377;hpb=b67ab9de01a2eb95875d27a26eb9c30b22edf97e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/sql.php b/maintenance/sql.php
index f0899729b9..e6a30a38fe 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -34,10 +34,13 @@ class MwSql extends Maintenance {
 		parent::__construct();
 		$this->addDescription( 'Send SQL queries to a MediaWiki database. ' .
 			'Takes a file name containing SQL as argument or runs interactively.' );
-		$this->addOption( 'query', 'Run a single query instead of running interactively', false, true );
+		$this->addOption( 'query',
+			'Run a single query instead of running interactively', false, true );
 		$this->addOption( 'cluster', 'Use an external cluster by name', false, true );
-		$this->addOption( 'wikidb', 'The database wiki ID to use if not the current one', false, true );
-		$this->addOption( 'slave', 'Use a slave server (either "any" or by name)', false, true );
+		$this->addOption( 'wikidb',
+			'The database wiki ID to use if not the current one', false, true );
+		$this->addOption( 'replicadb',
+			'Replica DB server to use instead of the master DB (can be "any")', false, true );
 	}
 
 	public function execute() {
@@ -50,30 +53,28 @@ class MwSql extends Maintenance {
 			$lb = wfGetLB( $wiki );
 		}
 		// Figure out which server to use
-		if ( $this->hasOption( 'slave' ) ) {
-			$server = $this->getOption( 'slave' );
-			if ( $server === 'any' ) {
-				$index = DB_SLAVE;
-			} else {
-				$index = null;
-				$serverCount = $lb->getServerCount();
-				for ( $i = 0; $i < $serverCount; ++$i ) {
-					if ( $lb->getServerName( $i ) === $server ) {
-						$index = $i;
-						break;
-					}
-				}
-				if ( $index === null ) {
-					$this->error( "No slave server configured with the name '$server'.", 1 );
+		$replicaDB = $this->getOption( 'replicadb', $this->getOption( 'slave', '' ) );
+		if ( $replicaDB === 'any' ) {
+			$index = DB_REPLICA;
+		} elseif ( $replicaDB != '' ) {
+			$index = null;
+			$serverCount = $lb->getServerCount();
+			for ( $i = 0; $i < $serverCount; ++$i ) {
+				if ( $lb->getServerName( $i ) === $replicaDB ) {
+					$index = $i;
+					break;
 				}
 			}
+			if ( $index === null ) {
+				$this->error( "No replica DB server configured with the name '$server'.", 1 );
+			}
 		} else {
 			$index = DB_MASTER;
 		}
 		// Get a DB handle (with this wiki's DB selected) from the appropriate load balancer
-		$db = $lb->getConnection( $index, array(), $wiki );
-		if ( $this->hasOption( 'slave' ) && $db->getLBInfo( 'master' ) !== null ) {
-			$this->error( "The server selected ({$db->getServer()}) is not a slave.", 1 );
+		$db = $lb->getConnection( $index, [], $wiki );
+		if ( $replicaDB != '' && $db->getLBInfo( 'master' ) !== null ) {
+			$this->error( "The server selected ({$db->getServer()}) is not a replica DB.", 1 );
 		}
 
 		if ( $this->hasArg( 0 ) ) {
@@ -82,7 +83,7 @@ class MwSql extends Maintenance {
 				$this->error( "Unable to open input file", true );
 			}
 
-			$error = $db->sourceStream( $file, false, array( $this, 'sqlPrintResult' ) );
+			$error = $db->sourceStream( $file, false, [ $this, 'sqlPrintResult' ] );
 			if ( $error !== true ) {
 				$this->error( $error, true );
 			} else {