Fix some issues with Microsoft SQL Server support

[lhc/web/wiklou.git] / includes / db / DatabaseSqlite.php

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 0fa29a1..468ed6d 100644 (file)
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -240,7 +240,7 @@ class DatabaseSqlite extends DatabaseBase {
        /**
         * @see DatabaseBase::isWriteQuery()
         *
-        * @param $sql string
+        * @param string $sql
         * @return bool
         */
        function isWriteQuery( $sql ) {
@@ -348,7 +348,7 @@ class DatabaseSqlite extends DatabaseBase {
 
        /**
         * @param ResultWrapper $res
-        * @param $n
+        * @param int $n
         * @return bool
         */
        function fieldName( $res, $n ) {
@@ -522,10 +522,11 @@ class DatabaseSqlite extends DatabaseBase {
         * @param array $options
         * @return string
         */
-       protected function makeUpdateOptions( $options ) {
+       protected function makeUpdateOptionsArray( $options ) {
+               $options = parent::makeUpdateOptionsArray( $options );
                $options = self::fixIgnore( $options );
 
-               return parent::makeUpdateOptions( $options );
+               return $options;
        }
 
        /**
@@ -746,7 +747,7 @@ class DatabaseSqlite extends DatabaseBase {
        }
 
        /**
-        * @param $b
+        * @param string $b
         * @return Blob
         */
        function encodeBlob( $b ) {
@@ -754,7 +755,7 @@ class DatabaseSqlite extends DatabaseBase {
        }
 
        /**
-        * @param $b Blob|string
+        * @param Blob|string $b
         * @return string
         */
        function decodeBlob( $b ) {