Merge "rdbms: fix Sqlite::tableExists() method to avoid STATUS_TRX_ERROR"

diff --combined includes/libs/rdbms/database/Database.php
index 57e5907,ded1140..3054156
--- 1/includes/libs/rdbms/database/Database.php
--- 2/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@@ -1214,13 -1214,13 +1214,13 @@@ abstract class Database implements IDat
  
                $startTime = microtime( true );
                if ( $this->profiler ) {
 -                      call_user_func( [ $this->profiler, 'profileIn' ], $queryProf );
 +                      $this->profiler->profileIn( $queryProf );
                }
                $this->affectedRowCount = null;
                $ret = $this->doQuery( $commentedSql );
                $this->affectedRowCount = $this->affectedRows();
                if ( $this->profiler ) {
 -                      call_user_func( [ $this->profiler, 'profileOut' ], $queryProf );
 +                      $this->profiler->profileOut( $queryProf );
                }
                $queryRuntime = max( microtime( true ) - $startTime, 0.0 );
  
@@@ -1925,18 -1925,7 +1925,7 @@@
                }
        }
  
-       public function tableExists( $table, $fname = __METHOD__ ) {
-               $tableRaw = $this->tableName( $table, 'raw' );
-               if ( isset( $this->sessionTempTables[$tableRaw] ) ) {
-                       return true; // already known to exist
-               }
- 
-               $table = $this->tableName( $table );
-               $ignoreErrors = true;
-               $res = $this->query( "SELECT 1 FROM $table LIMIT 1", $fname, $ignoreErrors );
- 
-               return (bool)$res;
-       }
+       abstract public function tableExists( $table, $fname = __METHOD__ );
  
        public function indexUnique( $table, $index ) {
                $indexInfo = $this->indexInfo( $table, $index );
@@@ -3230,7 -3219,7 +3219,7 @@@
                $e = null;
                do {
                        try {
 -                              $retVal = call_user_func_array( $function, $args );
 +                              $retVal = $function( ...$args );
                                break;
                        } catch ( DBQueryError $e ) {
                                if ( $this->wasDeadlock() ) {
@@@ -3310,7 -3299,7 +3299,7 @@@
                        // No transaction is active nor will start implicitly, so make one for this callback
                        $this->startAtomic( __METHOD__, self::ATOMIC_CANCELABLE );
                        try {
 -                              call_user_func( $callback, $this );
 +                              $callback( $this );
                                $this->endAtomic( __METHOD__ );
                        } catch ( Exception $e ) {
                                $this->cancelAtomic( __METHOD__ );
@@@ -3486,9 -3475,9 +3475,9 @@@
                                try {
                                        ++$count;
                                        list( $phpCallback ) = $callback;
 -                                      call_user_func( $phpCallback, $this );
 +                                      $phpCallback( $this );
                                } catch ( Exception $ex ) {
 -                                      call_user_func( $this->errorLogger, $ex );
 +                                      $this->errorLogger( $ex );
                                        $e = $e ?: $ex;
                                }
                        }
@@@ -3522,7 -3511,7 +3511,7 @@@
                        try {
                                $phpCallback( $trigger, $this );
                        } catch ( Exception $ex ) {
 -                              call_user_func( $this->errorLogger, $ex );
 +                              ( $this->errorLogger )( $ex );
                                $e = $e ?: $ex;
                        }
                }
@@@ -3723,7 -3712,7 +3712,7 @@@
        ) {
                $sectionId = $this->startAtomic( $fname, $cancelable );
                try {
 -                      $res = call_user_func_array( $callback, [ $this, $fname ] );
 +                      $res = $callback( $this, $fname );
                } catch ( Exception $e ) {
                        $this->cancelAtomic( $fname, $sectionId );
  
@@@ -4249,7 -4238,7 +4238,7 @@@
                                $cmd = $this->replaceVars( $cmd );
  
                                if ( $inputCallback ) {
 -                                      $callbackResult = call_user_func( $inputCallback, $cmd );
 +                                      $callbackResult = $inputCallback( $cmd );
  
                                        if ( is_string( $callbackResult ) || !$callbackResult ) {
                                                $cmd = $callbackResult;
@@@ -4260,7 -4249,7 +4249,7 @@@
                                        $res = $this->query( $cmd, $fname );
  
                                        if ( $resultCallback ) {
 -                                              call_user_func( $resultCallback, $res, $this );
 +                                              $resultCallback( $res, $this );
                                        }
  
                                        if ( false === $res ) {

diff --combined includes/libs/rdbms/database/DatabaseSqlite.php
index 4b925e6,2ebb1a9..d86c5ce
--- 1/includes/libs/rdbms/database/DatabaseSqlite.php
--- 2/includes/libs/rdbms/database/DatabaseSqlite.php
+++ b/includes/libs/rdbms/database/DatabaseSqlite.php
@@@ -519,6 -519,19 +519,19 @@@ class DatabaseSqlite extends Database 
                return $this->lastAffectedRowCount;
        }
  
+       function tableExists( $table, $fname = __METHOD__ ) {
+               $tableRaw = $this->tableName( $table, 'raw' );
+               if ( isset( $this->sessionTempTables[$tableRaw] ) ) {
+                       return true; // already known to exist
+               }
+ 
+               $encTable = $this->addQuotes( $tableRaw );
+               $res = $this->query(
+                       "SELECT 1 FROM sqlite_master WHERE type='table' AND name=$encTable" );
+ 
+               return $res->numRows() ? true : false;
+       }
+ 
        /**
         * Returns information about an index
         * Returns false if the index does not exist
@@@ -865,7 -878,7 +878,7 @@@
                $args = func_get_args();
                $function = array_shift( $args );
  
 -              return call_user_func_array( $function, $args );
 +              return $function( ...$args );
        }
  
        /**