Deleting test transactions are not good. They may be in proggress. Let's update WHERE...

Merged from MOODLE_16_STABLE.

diff --git a/enrol/authorize/db/mysql.php b/enrol/authorize/db/mysql.php
index 06fba43906986042f662175005ec5371a7ec99fc..fb34c1cdb850a826f906afc3312f61479e8b3958 100755 (executable)
--- a/enrol/authorize/db/mysql.php
+++ b/enrol/authorize/db/mysql.php
@@ -30,12 +30,11 @@ function enrol_authorize_upgrade($oldversion=0) {
         table_column('enrol_authorize', '', 'timeupdated', 'integer', '10', 'unsigned', '0', 'not null', 'timecreated');
         // status index for speed.
         execute_sql("ALTER TABLE `{$CFG->prefix}enrol_authorize` ADD INDEX status(status)");
-        // Delete test transactions before update status as AN_STATUS_AUTHCAPTURE.
-        execute_sql("DELETE FROM `{$CFG->prefix}enrol_authorize` WHERE transid='0'", false);
         // defaults.
-        $timenow = time();
         $status = AN_STATUS_AUTH | AN_STATUS_CAPTURE;
-        execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET timecreated='$timenow', timeupdated='$timenow', status='$status'", false);
+        execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET status='$status' WHERE transid<>'0'", false);
+        $timenow = time();
+        execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET timecreated='$timenow', timeupdated='$timenow'", false);
     }
 
     if ($oldversion < 2005121200) {

diff --git a/enrol/authorize/db/postgres7.php b/enrol/authorize/db/postgres7.php
index b32d9d7f123f6200b8688eee34d4bc4cb1f61c2a..07ac8e06945ea6e63571615b245ee6129ffd6c44 100644 (file)
--- a/enrol/authorize/db/postgres7.php
+++ b/enrol/authorize/db/postgres7.php
@@ -41,12 +41,11 @@ function enrol_authorize_upgrade($oldversion=0) {
         table_column('enrol_authorize', '', 'timeupdated', 'integer', '10', 'unsigned', '0', 'not null', 'timecreated');
         // status index for speed.
         modify_database('',"CREATE INDEX prefix_enrol_authorize_status_idx ON prefix_enrol_authorize (status);");
-        // Delete test transactions before update status as AN_STATUS_AUTHCAPTURE.
-        execute_sql("DELETE FROM {$CFG->prefix}enrol_authorize WHERE transid='0'", false);
         // defaults.
-        $timenow = time();
         $status = AN_STATUS_AUTH | AN_STATUS_CAPTURE;
-        execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET timecreated='$timenow', timeupdated='$timenow', status='$status'", false);
+        execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET status='$status' WHERE transid<>'0'", false);
+        $timenow = time();
+        execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET timecreated='$timenow', timeupdated='$timenow'", false);
     }
 
     if ($oldversion < 2005121200) {