MDL-36721 make upgrade queries cross-db

moodle · Jan 10, 2014 · a4a01b4 · a4a01b4
1 parent 09aa9e9
commit a4a01b4
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -1870,30 +1870,34 @@ function xmldb_main_upgrade($oldversion) {
             'enrol_database/dbpass', 'enrol_ldap/bind_pw', 'url/secretphrase');
         foreach ($items as $item) {
             list($plugin, $name) = explode('/', $item);
+            $sqlcomparevalue =  $DB->sql_compare_text('value');
+            $sqlcompareoldvalue = $DB->sql_compare_text('oldvalue');
+            $sqlempty = $DB->sql_empty();
+
             if ($plugin === 'core') {
                 $sql = "UPDATE {config_log}
                            SET value = :value
-                         WHERE name = :name AND plugin IS NULL AND value <> ''";
-                $params = array('value'=>'********', 'name'=>$name);
+                         WHERE name = :name AND plugin IS NULL AND $sqlcomparevalue <> :empty";
+                $params = array('value' => '********', 'name' => $name, 'empty' => $sqlempty);
                 $DB->execute($sql, $params);
 
                 $sql = "UPDATE {config_log}
                            SET oldvalue = :value
-                         WHERE name = :name AND plugin IS NULL AND oldvalue <> ''";
-                $params = array('value'=>'********', 'name'=>$name);
+                         WHERE name = :name AND plugin IS NULL AND $sqlcompareoldvalue <> :empty";
+                $params = array('value' => '********', 'name' => $name, 'empty' => $sqlempty);
                 $DB->execute($sql, $params);
 
             } else {
                 $sql = "UPDATE {config_log}
                            SET value = :value
-                         WHERE name = :name AND plugin = :plugin AND value <> ''";
-                $params = array('value'=>'********', 'name'=>$name, 'plugin'=>$plugin);
+                         WHERE name = :name AND plugin = :plugin AND $sqlcomparevalue <> :empty";
+                $params = array('value' => '********', 'name' => $name, 'plugin' => $plugin, 'empty' => $sqlempty);
                 $DB->execute($sql, $params);
 
                 $sql = "UPDATE {config_log}
                            SET oldvalue = :value
-                         WHERE name = :name AND plugin = :plugin AND oldvalue <> ''";
-                $params = array('value'=>'********', 'name'=>$name, 'plugin'=>$plugin);
+                         WHERE name = :name AND plugin = :plugin AND  $sqlcompareoldvalue <> :empty";
+                $params = array('value' => '********', 'name' => $name, 'plugin' => $plugin, 'empty' => $sqlempty);
                 $DB->execute($sql, $params);
             }
         }