rdbms: Pass required parameter

[lhc/web/wiklou.git] / includes / libs / rdbms / database / Database.php

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 16e8d8b..63d648d 100644 (file)
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2038,10 +2038,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        $options = [ $options ];
                }
 
-               $fh = null;
-               if ( isset( $options['fileHandle'] ) ) {
-                       $fh = $options['fileHandle'];
-               }
                $options = $this->makeInsertOptions( $options );
 
                if ( isset( $a[0] ) && is_array( $a[0] ) ) {
@@ -2069,13 +2065,9 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        $sql .= '(' . $this->makeList( $a ) . ')';
                }
 
-               if ( $fh !== null && false === fwrite( $fh, $sql ) ) {
-                       return false;
-               } elseif ( $fh !== null ) {
-                       return true;
-               }
+               $this->query( $sql, $fname );
 
-               return (bool)$this->query( $sql, $fname );
+               return true;
        }
 
        /**
@@ -2119,7 +2111,9 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        $sql .= " WHERE " . $this->makeList( $conds, self::LIST_AND );
                }
 
-               return (bool)$this->query( $sql, $fname );
+               $this->query( $sql, $fname );
+
+               return true;
        }
 
        public function makeList( $a, $mode = self::LIST_COMMA ) {
@@ -2833,8 +2827,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
         * @param string $table Table name
         * @param array|string $rows Row(s) to insert
         * @param string $fname Caller function name
-        *
-        * @return ResultWrapper
         */
        protected function nativeReplace( $table, $rows, $fname ) {
                $table = $this->tableName( $table );
@@ -2857,7 +2849,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        $sql .= '(' . $this->makeList( $row ) . ')';
                }
 
-               return $this->query( $sql, $fname );
+               $this->query( $sql, $fname );
        }
 
        public function upsert( $table, array $rows, array $uniqueIndexes, array $set,
@@ -2893,13 +2885,11 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        $this->startAtomic( $fname, self::ATOMIC_CANCELABLE );
                        # Update any existing conflicting row(s)
                        if ( $where !== false ) {
-                               $ok = $this->update( $table, $set, $where, $fname );
+                               $this->update( $table, $set, $where, $fname );
                                $affectedRowCount += $this->affectedRows();
-                       } else {
-                               $ok = true;
                        }
                        # Now insert any non-conflicting row(s)
-                       $ok = $this->insert( $table, $rows, $fname, [ 'IGNORE' ] ) && $ok;
+                       $this->insert( $table, $rows, $fname, [ 'IGNORE' ] );
                        $affectedRowCount += $this->affectedRows();
                        $this->endAtomic( $fname );
                        $this->affectedRowCount = $affectedRowCount;
@@ -2908,7 +2898,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        throw $e;
                }
 
-               return $ok;
+               return true;
        }
 
        public function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds,
@@ -2961,7 +2951,9 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        $sql .= ' WHERE ' . $conds;
                }
 
-               return $this->query( $sql, $fname );
+               $this->query( $sql, $fname );
+
+               return true;
        }
 
        final public function insertSelect(
@@ -2976,7 +2968,18 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                if ( $this->cliMode && $this->isInsertSelectSafe( $insertOptions, $selectOptions ) ) {
                        // For massive migrations with downtime, we don't want to select everything
                        // into memory and OOM, so do all this native on the server side if possible.
-                       return $this->nativeInsertSelect(
+                       $this->nativeInsertSelect(
+                               $destTable,
+                               $srcTable,
+                               $varMap,
+                               $conds,
+                               $fname,
+                               array_diff( $insertOptions, $hints ),
+                               $selectOptions,
+                               $selectJoinConds
+                       );
+               } else {
+                       $this->nonNativeInsertSelect(
                                $destTable,
                                $srcTable,
                                $varMap,
@@ -2988,16 +2991,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        );
                }
 
-               return $this->nonNativeInsertSelect(
-                       $destTable,
-                       $srcTable,
-                       $varMap,
-                       $conds,
-                       $fname,
-                       array_diff( $insertOptions, $hints ),
-                       $selectOptions,
-                       $selectJoinConds
-               );
+               return true;
        }
 
        /**
@@ -3023,7 +3017,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
         * @param array $insertOptions
         * @param array $selectOptions
         * @param array $selectJoinConds
-        * @return bool
         */
        protected function nonNativeInsertSelect( $destTable, $srcTable, $varMap, $conds,
                $fname = __METHOD__,
@@ -3041,7 +3034,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        $srcTable, implode( ',', $fields ), $conds, $fname, $selectOptions, $selectJoinConds
                );
                if ( !$res ) {
-                       return false;
+                       return;
                }
 
                try {
@@ -3074,7 +3067,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        } else {
                                $this->cancelAtomic( $fname );
                        }
-                       return $ok;
                } catch ( Exception $e ) {
                        $this->cancelAtomic( $fname );
                        throw $e;
@@ -3094,7 +3086,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
         * @param array $insertOptions
         * @param array $selectOptions
         * @param array $selectJoinConds
-        * @return bool
         */
        protected function nativeInsertSelect( $destTable, $srcTable, $varMap, $conds,
                $fname = __METHOD__,
@@ -3121,7 +3112,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                        " INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ') ' .
                        $selectSql;
 
-               return $this->query( $sql, $fname );
+               $this->query( $sql, $fname );
        }
 
        /**
@@ -3751,7 +3742,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                                }
                        }
                        if ( $pos < 0 ) {
-                               throw new DBUnexpectedError( "Atomic section not found (for $fname)" );
+                               throw new DBUnexpectedError( $this, "Atomic section not found (for $fname)" );
                        }
                        // Remove all descendant sections and re-index the array
                        $excisedIds = [];