Taking out addition of wrongly named metacourse tables for first upgrade. Those who...

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index f7ab81b8c0b82e93c9021df19bb260fd584f8fbd..a37cefb7649164b6eaabb3df936c812d829bb872 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1105,6 +1105,7 @@ function main_upgrade($oldversion=0) {
     
 
     if ($oldversion < 2005012500) { 
+        /*
         // add new table for meta courses.
         modify_database("","CREATE TABLE `prefix_meta_course` (
             `id` int(1) unsigned NOT NULL auto_increment,
@@ -1116,6 +1117,7 @@ function main_upgrade($oldversion=0) {
         );");
         // add flag to course field
         table_column('course','','meta_course','integer','1','','0','not null');
+        */ // taking this OUT for upgrade from 1.4 to 1.5 (those tracking head will have already seen it)
     }
 
     if ($oldversion < 2005012501) { 

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index aac11d7983a069460459b3ee7a63fe190e4f5407..b368d8de0b65c79ba8db2e7119f47d50e0760f8d 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -879,6 +879,7 @@ function main_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2005012500) { // add new table for meta courses.
+        /*
         modify_database("","CREATE TABLE prefix_meta_course (
                 id SERIAL primary key,
                 parent_course integer NOT NULL,
@@ -888,6 +889,7 @@ function main_upgrade($oldversion=0) {
         modify_database("","CREATE INDEX prefix_meta_course_parent_idx ON prefix_meta_course (parent_course);");
         modify_database("","CREATE INDEX prefix_meta_course_child_idx ON prefix_meta_course (child_course);");
         table_column('course','','meta_course','integer','1','','0','not null');
+        */ // taking this OUT for upgrade from 1.4 to 1.5 (those tracking head will have already seen it)
     }
 
     if ($oldversion < 2005012501) { //fix table names for consistency