X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fsql.php;h=5cad5a75d7f4a965ac41a157e295de316e8a0e63;hb=1e738d95b5339d157ad2c4f6f223ffbaeb1fa201;hp=66de5b19ec3e0d9da05bd842ccd8cb4c4703c63a;hpb=760b1e8c3baa03f27900d227faba53842524023f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/sql.php b/maintenance/sql.php
index 66de5b19ec..5cad5a75d7 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script that sends SQL queries from the specified file to the database.
@@ -34,23 +34,51 @@ class MwSql extends Maintenance {
 		parent::__construct();
 		$this->mDescription = "Send SQL queries to a MediaWiki database";
 		$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 );
 	}
 
 	public function execute() {
-		// Get a DB handle (with this wiki's DB select) from the appropriate load balancer
+		$wiki = $this->getOption( 'wikidb' ) ?: false;
+		// Get the appropriate load balancer (for this wiki)
 		if ( $this->hasOption( 'cluster' ) ) {
-			$lb = wfGetLBFactory()->getExternalLB( $this->getOption( 'cluster' ) );
-			$dbw = $lb->getConnection( DB_MASTER ); // master for external LB
+			$lb = wfGetLBFactory()->getExternalLB( $this->getOption( 'cluster' ), $wiki );
 		} else {
-			$dbw = wfGetDB( DB_MASTER ); // master for primary LB for this wiki
+			$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;
+				for ( $i = 0; $i < $lb->getServerCount(); ++$i ) {
+					if ( $lb->getServerName( $i ) === $server ) {
+						$index = $i;
+						break;
+					}
+				}
+				if ( $index === null ) {
+					$this->error( "No slave 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 );
+		}
+
 		if ( $this->hasArg( 0 ) ) {
 			$file = fopen( $this->getArg( 0 ), 'r' );
 			if ( !$file ) {
 				$this->error( "Unable to open input file", true );
 			}
 
-			$error = $dbw->sourceStream( $file, false, array( $this, 'sqlPrintResult' ) );
+			$error = $db->sourceStream( $file, false, array( $this, 'sqlPrintResult' ) );
 			if ( $error !== true ) {
 				$this->error( $error, true );
 			} else {
@@ -76,7 +104,7 @@ class MwSql extends Maintenance {
 				# User simply pressed return key
 				continue;
 			}
-			$done = $dbw->streamStatementEnd( $wholeLine, $line );
+			$done = $db->streamStatementEnd( $wholeLine, $line );
 
 			$wholeLine .= $line;
 
@@ -88,12 +116,12 @@ class MwSql extends Maintenance {
 			if ( $useReadline ) {
 				# Delimiter is eated by streamStatementEnd, we add it
 				# up in the history (bug 37020)
-				readline_add_history( $wholeLine . $dbw->getDelimiter() );
+				readline_add_history( $wholeLine . $db->getDelimiter() );
 				readline_write_history( $historyFile );
 			}
 			try {
-				$res = $dbw->query( $wholeLine );
-				$this->sqlPrintResult( $res, $dbw );
+				$res = $db->query( $wholeLine );
+				$this->sqlPrintResult( $res, $db );
 				$prompt = $newPrompt;
 				$wholeLine = '';
 			} catch ( DBQueryError $e ) {
@@ -132,4 +160,4 @@ class MwSql extends Maintenance {
 }
 
 $maintClass = "MwSql";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;