diff --git a/lib/db/mysql.php b/lib/db/mysql.php index 18509b333e987..89aa164a05b7d 100644 --- a/lib/db/mysql.php +++ b/lib/db/mysql.php @@ -1312,6 +1312,12 @@ function main_upgrade($oldversion=0) { } + if ($oldversion < 2005033100) { // Get rid of defunct field from course modules table + delete_records('course_modules', 'deleted', 1); // Delete old records we don't need any more + execute_sql('ALTER TABLE `'.$CFG->prefix.'course_modules` DROP INDEX `deleted`'); // Old index + execute_sql('ALTER TABLE `'.$CFG->prefix.'course_modules` DROP `deleted`'); // Old field + } + return $result; } diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql index beb0c09a03892..b3598da4d8f25 100644 --- a/lib/db/mysql.sql +++ b/lib/db/mysql.sql @@ -129,7 +129,6 @@ CREATE TABLE `prefix_course_modules` ( `instance` int(10) unsigned NOT NULL default '0', `section` int(10) unsigned NOT NULL default '0', `added` int(10) unsigned NOT NULL default '0', - `deleted` tinyint(1) unsigned NOT NULL default '0', `score` tinyint(4) NOT NULL default '0', `indent` int(5) unsigned NOT NULL default '0', `visible` tinyint(1) NOT NULL default '1', @@ -139,8 +138,7 @@ CREATE TABLE `prefix_course_modules` ( KEY `visible` (`visible`), KEY `course` (`course`), KEY `module` (`module`), - KEY `instance` (`instance`), - KEY `deleted` (`deleted`) + KEY `instance` (`instance`) ) TYPE=MyISAM; # -------------------------------------------------------- diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php index 63e552963ebc1..6e2b8600f0fef 100644 --- a/lib/db/postgres7.php +++ b/lib/db/postgres7.php @@ -1028,6 +1028,12 @@ function main_upgrade($oldversion=0) { modify_database('',"CREATE UNIQUE INDEX prefix_grade_prefs_courseidpref_uk ON prefix_grade_preferences (courseid,preference);"); } + if ($oldversion < 2005033100) { // Get rid of defunct field from course modules table + delete_records('course_modules', 'deleted', 1); // Delete old records we don't need any more + execute_sql('DROP INDEX '.$CFG->prefix.'prefix_course_modules_deleted_idx;'); // Old index + execute_sql('ALTER TABLE '.$CFG->prefix.'course_modules DROP `deleted`;'); // Old field + } + return $result; } diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql index e8fcf8b598271..ed4505462ef4c 100644 --- a/lib/db/postgres7.sql +++ b/lib/db/postgres7.sql @@ -81,7 +81,6 @@ CREATE TABLE prefix_course_modules ( instance integer NOT NULL default '0', section integer NOT NULL default '0', added integer NOT NULL default '0', - deleted integer NOT NULL default '0', score integer NOT NULL default '0', indent integer NOT NULL default '0', visible integer NOT NULL default '1', @@ -92,7 +91,6 @@ CREATE INDEX prefix_course_modules_visible_idx ON prefix_course_modules (visible CREATE INDEX prefix_course_modules_course_idx ON prefix_course_modules (course); CREATE INDEX prefix_course_modules_module_idx ON prefix_course_modules (module); CREATE INDEX prefix_course_modules_instance_idx ON prefix_course_modules (instance); -CREATE INDEX prefix_course_modules_deleted_idx ON prefix_course_modules (deleted); CREATE TABLE prefix_course_sections ( id SERIAL PRIMARY KEY, diff --git a/version.php b/version.php index c902a6a685977..107a4311db696 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 = 2005032800; // YYYYMMDD = date + $version = 2005033100; // YYYYMMDD = date // XY = increments within a single day $release = '1.5 UNSTABLE DEVELOPMENT'; // Human-friendly version name