Merge "Various small cleanups to ResultWrapper"

diff --combined includes/libs/rdbms/database/DatabaseSqlite.php
index 817f8b4,46b1fc2..8881983
--- 1/includes/libs/rdbms/database/DatabaseSqlite.php
--- 2/includes/libs/rdbms/database/DatabaseSqlite.php
+++ b/includes/libs/rdbms/database/DatabaseSqlite.php
@@@ -300,12 -300,12 +300,12 @@@ class DatabaseSqlite extends DatabaseBa
                $res = $this->mConn->query( $sql );
                if ( $res === false ) {
                        return false;
-               } else {
-                       $r = $res instanceof ResultWrapper ? $res->result : $res;
-                       $this->mAffectedRows = $r->rowCount();
-                       $res = new ResultWrapper( $this, $r->fetchAll() );
                }
  
+               $r = $res instanceof ResultWrapper ? $res->result : $res;
+               $this->mAffectedRows = $r->rowCount();
+               $res = new ResultWrapper( $this, $r->fetchAll() );
+ 
                return $res;
        }
  
@@@ -834,6 -834,13 +834,6 @@@
                return 'CAST ( ' . $field . ' AS TEXT )';
        }
  
 -      /**
 -       * @return string
 -       */
 -      public function getSearchEngine() {
 -              return "SearchSqlite";
 -      }
 -
        /**
         * No-op version of deadlockLoop
         *
@@@ -1053,4 -1060,4 +1053,4 @@@
                return 'SQLite ' . (string)$this->mConn->getAttribute( PDO::ATTR_SERVER_VERSION );
        }
  
- } // end DatabaseSqlite class
+ }