Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311592

Change subject: Fix undefined getDelimiter() call in sql.php
......................................................................

Fix undefined getDelimiter() call in sql.php

Also fixed numerous IDEA warnings.

Change-Id: Id41faff835ca25399ce1ceb10a19d19ffc914689
---
M maintenance/sql.php
1 file changed, 15 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/92/311592/1

diff --git a/maintenance/sql.php b/maintenance/sql.php
index e6a30a3..a9fe45a 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -44,6 +44,8 @@
        }
 
        public function execute() {
+               global $IP;
+
                // We wan't to allow "" for the wikidb, meaning don't call 
select_db()
                $wiki = $this->hasOption( 'wikidb' ) ? $this->getOption( 
'wikidb' ) : false;
                // Get the appropriate load balancer (for this wiki)
@@ -66,12 +68,13 @@
                                }
                        }
                        if ( $index === null ) {
-                               $this->error( "No replica DB server configured 
with the name '$server'.", 1 );
+                               $this->error( "No replica DB server configured 
with the name '$replicaDB'.", 1 );
                        }
                } else {
                        $index = DB_MASTER;
                }
-               // Get a DB handle (with this wiki's DB selected) from the 
appropriate load balancer
+
+               /** @var Database $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 );
@@ -98,14 +101,15 @@
                        return;
                }
 
-               $useReadline = function_exists( 'readline_add_history' )
-                       && Maintenance::posix_isatty( 0 /*STDIN*/ );
-
-               if ( $useReadline ) {
-                       global $IP;
+               if (
+                       function_exists( 'readline_add_history' ) &&
+                       Maintenance::posix_isatty( 0 /*STDIN*/ )
+               ) {
                        $historyFile = isset( $_ENV['HOME'] ) ?
                                "{$_ENV['HOME']}/.mwsql_history" : 
"$IP/maintenance/.mwsql_history";
                        readline_read_history( $historyFile );
+               } else {
+                       $historyFile = null;
                }
 
                $wholeLine = '';
@@ -126,10 +130,10 @@
                                $prompt = '    -> ';
                                continue;
                        }
-                       if ( $useReadline ) {
+                       if ( $historyFile ) {
                                # Delimiter is eated by streamStatementEnd, we 
add it
                                # up in the history (bug 37020)
-                               readline_add_history( $wholeLine . 
$db->getDelimiter() );
+                               readline_add_history( $wholeLine . ';' );
                                readline_write_history( $historyFile );
                        }
                        $this->sqlDoQuery( $db, $wholeLine, $doDie );
@@ -139,7 +143,7 @@
                wfWaitForSlaves();
        }
 
-       protected function sqlDoQuery( $db, $line, $dieOnError ) {
+       protected function sqlDoQuery( IDatabase $db, $line, $dieOnError ) {
                try {
                        $res = $db->query( $line );
                        $this->sqlPrintResult( $res, $db );
@@ -151,7 +155,7 @@
        /**
         * Print the results, callback for $db->sourceStream()
         * @param ResultWrapper $res The results object
-        * @param DatabaseBase $db
+        * @param IDatabase $db
         */
        public function sqlPrintResult( $res, $db ) {
                if ( !$res ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/311592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id41faff835ca25399ce1ceb10a19d19ffc914689
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to