From: aude <aude.wiki@gmail.com>
Date: Wed, 12 Mar 2014 12:25:20 +0000 (+0100)
Subject: Fix IGNORE option for sqlite update
X-Git-Tag: 1.31.0-rc.0~16646^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=e611604d10897f3b0adb6e06f2eb2338f8e83e28;p=lhc%2Fweb%2Fwiklou.git

Fix IGNORE option for sqlite update

this fixes the issue of the normalized sqlite
IGNORE option being discarded and ignored in
DatabaseBase::makeUpdateOptions.

Change-Id: I01579dee0f939a56c086d13683a60f4400014f62
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 21c868ecb7..967d7a112d 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @defgroup Database Database
  *
@@ -1921,12 +1922,12 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
 	}
 
 	/**
-	 * Make UPDATE options for the DatabaseBase::update function
+	 * Make UPDATE options array for DatabaseBase::makeUpdateOptions
 	 *
-	 * @param array $options The options passed to DatabaseBase::update
-	 * @return string
+	 * @param array $options
+	 * @return array
 	 */
-	protected function makeUpdateOptions( $options ) {
+	protected function makeUpdateOptionsArray( $options ) {
 		if ( !is_array( $options ) ) {
 			$options = array( $options );
 		}
@@ -1941,6 +1942,18 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
 			$opts[] = 'IGNORE';
 		}
 
+		return $opts;
+	}
+
+    /**
+     * Make UPDATE options for the DatabaseBase::update function
+     *
+     * @param array $options The options passed to DatabaseBase::update
+     * @return string
+     */
+	protected function makeUpdateOptions( $options ) {
+		$opts = $this->makeUpdateOptionsArray( $options );
+
 		return implode( ' ', $opts );
 	}
 
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 0fa29a1a5c..3313d25841 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -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;
 	}
 
 	/**