Merge "parserTests: Do not check for DjVu support"

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

diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php b/includes/libs/rdbms/database/DatabaseSqlite.php
index 11acde7..3ccf3f0 100644 (file)
--- a/includes/libs/rdbms/database/DatabaseSqlite.php
+++ b/includes/libs/rdbms/database/DatabaseSqlite.php
@@ -25,7 +25,7 @@
 /**
  * @ingroup Database
  */
-class DatabaseSqlite extends DatabaseBase {
+class DatabaseSqlite extends Database {
        /** @var bool Whether full text is enabled */
        private static $fulltextEnabled = null;
 
@@ -117,7 +117,7 @@ class DatabaseSqlite extends DatabaseBase {
                $p['schema'] = false;
                $p['tablePrefix'] = '';
 
-               return DatabaseBase::factory( 'sqlite', $p );
+               return Database::factory( 'sqlite', $p );
        }
 
        /**
@@ -171,7 +171,7 @@ class DatabaseSqlite extends DatabaseBase {
 
                $this->dbPath = $fileName;
                try {
-                       if ( $this->mFlags & DBO_PERSISTENT ) {
+                       if ( $this->mFlags & self::DBO_PERSISTENT ) {
                                $this->mConn = new PDO( "sqlite:$fileName", '', '',
                                        [ PDO::ATTR_PERSISTENT => true ] );
                        } else {
@@ -300,12 +300,12 @@ class DatabaseSqlite extends DatabaseBase {
                $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;
        }
 
@@ -426,16 +426,6 @@ class DatabaseSqlite extends DatabaseBase {
                return str_replace( '"', '', parent::tableName( $name, $format ) );
        }
 
-       /**
-        * Index names have DB scope
-        *
-        * @param string $index
-        * @return string
-        */
-       protected function indexName( $index ) {
-               return $index;
-       }
-
        /**
         * This must be called after nextSequenceVal
         *
@@ -783,8 +773,8 @@ class DatabaseSqlite extends DatabaseBase {
        }
 
        /**
-        * @param Blob|string $s
-        * @return string
+        * @param string|int|null|bool|Blob $s
+        * @return string|int
         */
        function addQuotes( $s ) {
                if ( $s instanceof Blob ) {
@@ -834,13 +824,6 @@ class DatabaseSqlite extends DatabaseBase {
                return 'CAST ( ' . $field . ' AS TEXT )';
        }
 
-       /**
-        * @return string
-        */
-       public function getSearchEngine() {
-               return "SearchSqlite";
-       }
-
        /**
         * No-op version of deadlockLoop
         *
@@ -1053,11 +1036,14 @@ class DatabaseSqlite extends DatabaseBase {
                return $this->query( $sql, $fName );
        }
 
+       protected function requiresDatabaseUser() {
+               return false; // just a file
+       }
+
        /**
         * @return string
         */
        public function __toString() {
                return 'SQLite ' . (string)$this->mConn->getAttribute( PDO::ATTR_SERVER_VERSION );
        }
-
-} // end DatabaseSqlite class
+}