From fa1621449ac95a5960c8b5e35a6604427a54cc28 Mon Sep 17 00:00:00 2001 From: cataluke <cataluke> Date: Mon, 16 Jun 2008 00:16:00 +0000 Subject: [PATCH] MDL-15156 fix conflict in schema for MNET PREFIX_mnet_enrol_course table, merged from 19 --- lib/db/upgrade.php | 7 +++++++ version.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index ab98e01da6..c5c584ba78 100644 --- 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 760009e724..12ddf6d674 100644 --- 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 -- 2.39.5