MDL-15156 fix conflict in schema for MNET PREFIX_mnet_enrol_course table, merged...

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index ab98e01da672a3a1c0e49b841cf524479bd40d3a..c5c584ba7875eea6cf3c1acda353e911036c86ca 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -128,6 +128,13 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2008051202);
     }
 
+    if ($result && $oldversion < 2008051203) {
+        $table = new xmldb_table('mnet_enrol_course');
+        $field = new xmldb_field('sortorder', XMLDB_TYPE_INTEGER, '10', true, true, null, false, false, 0);
+        $result = $dbman->change_field_precision($table, $field);
+        upgrade_main_savepoint($result, 2008051203);
+    }
+
 /*
  * TODO:
  *   drop adodb_logsql table and create a new general sql log table

diff --git a/version.php b/version.php
index 760009e724b68cd9ecab4009ba3910913c63e680..12ddf6d6747f39d5f239c6f5e5d57458c80b941c 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2008051202;  // YYYYMMDD   = date of the last version bump
+    $version = 2008051203;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20080615)';  // Human-friendly version name