WebRequest: Use getRawVal instead of getGPCVal where possible

[lhc/web/wiklou.git] / maintenance / sql.php

diff --git a/maintenance/sql.php b/maintenance/sql.php
index a7fd827..e6a30a3 100644 (file)
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -32,11 +32,15 @@ require_once __DIR__ . '/Maintenance.php';
 class MwSql extends Maintenance {
        public function __construct() {
                parent::__construct();
-               $this->mDescription = "Send SQL queries to a MediaWiki database. " .
-                               "Takes a file name containing SQL as argument or runs interactively.";
+               $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( '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() {
@@ -49,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 ) ) {
@@ -81,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 {
@@ -89,6 +91,13 @@ class MwSql extends Maintenance {
                        }
                }
 
+               if ( $this->hasOption( 'query' ) ) {
+                       $query = $this->getOption( 'query' );
+                       $this->sqlDoQuery( $db, $query, /* dieOnError */ true );
+                       wfWaitForSlaves();
+                       return;
+               }
+
                $useReadline = function_exists( 'readline_add_history' )
                        && Maintenance::posix_isatty( 0 /*STDIN*/ );
 
@@ -102,6 +111,7 @@ class MwSql extends Maintenance {
                $wholeLine = '';
                $newPrompt = '> ';
                $prompt = $newPrompt;
+               $doDie = !Maintenance::posix_isatty( 0 );
                while ( ( $line = Maintenance::readconsole( $prompt ) ) !== false ) {
                        if ( !$line ) {
                                # User simply pressed return key
@@ -122,19 +132,22 @@ class MwSql extends Maintenance {
                                readline_add_history( $wholeLine . $db->getDelimiter() );
                                readline_write_history( $historyFile );
                        }
-                       try {
-                               $res = $db->query( $wholeLine );
-                               $this->sqlPrintResult( $res, $db );
-                       } catch ( DBQueryError $e ) {
-                               $doDie = !Maintenance::posix_isatty( 0 );
-                               $this->error( $e, $doDie );
-                       }
+                       $this->sqlDoQuery( $db, $wholeLine, $doDie );
                        $prompt = $newPrompt;
                        $wholeLine = '';
                }
                wfWaitForSlaves();
        }
 
+       protected function sqlDoQuery( $db, $line, $dieOnError ) {
+               try {
+                       $res = $db->query( $line );
+                       $this->sqlPrintResult( $res, $db );
+               } catch ( DBQueryError $e ) {
+                       $this->error( $e, $dieOnError );
+               }
+       }
+
        /**
         * Print the results, callback for $db->sourceStream()
         * @param ResultWrapper $res The results object