Remove "deleted" field from course_modules table

http://moodle.org/mod/forum/discuss.php?d=20715
moodle · Mar 31, 2005 · 594ceed · 594ceed
1 parent 90d0ae4
commit 594ceed
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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