moved the database update code to where it belongs

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 6f220b143df31d06cb7cb3ae9be6c5f9f4014006..1fe42506f7e0b1e0adfcc32ee55c09585ae1d621 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -633,10 +633,6 @@ function main_upgrade($oldversion=0) {
     if ($oldversion < 2004012900) {
         table_column("config", "value", "value", "text", "", "", "");
     }
-    
-    if ($oldversion < 2004013000) {
-        table_column("forum_posts", "mailed", "mailed", "tinyint", "2");
-    }
 
     return $result;
 

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 944b1a9c7aa64eafb6629cf237054a3f8c347ca2..dadb93faf67a0094629769260031120a853356d6 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -380,10 +380,6 @@ function main_upgrade($oldversion=0) {
         table_column("config", "value", "value", "text", "", "", "");
     }
     
-    if ($oldversion < 2004013000) {
-        table_column("forum_posts", "mailed", "mailed", "tinyint", "2");
-    }
-    
     return $result;
 }
 

diff --git a/mod/forum/db/mysql.php b/mod/forum/db/mysql.php
index 2b3f14a8b1213b6940026c8d7f785960a8a12ffe..9bdc25751a717b630914e505b6555f3c98b4bb04 100644 (file)
--- a/mod/forum/db/mysql.php
+++ b/mod/forum/db/mysql.php
@@ -100,6 +100,10 @@ function forum_upgrade($oldversion) {
   if ($oldversion < 2004012200) {
       table_column("forum_discussions", "", "groupid", "integer", "10", "unsigned", "0", "", "userid");
   }
+
+  if ($oldversion < 2004013000) {
+      table_column("forum_posts", "mailed", "mailed", "tinyint", "2");
+  }
   
   return true;
 

diff --git a/mod/forum/db/mysql.sql b/mod/forum/db/mysql.sql
index 4af670d89cdab5ad874a50a5e7162ed69a03de84..26e373fde52c2e35840d7469c2a28ce910f6b2cc 100644 (file)
--- a/mod/forum/db/mysql.sql
+++ b/mod/forum/db/mysql.sql
@@ -51,7 +51,7 @@ CREATE TABLE prefix_forum_posts (
   userid int(10) unsigned NOT NULL default '0',
   created int(10) unsigned NOT NULL default '0',
   modified int(10) unsigned NOT NULL default '0',
-  mailed tinyint(1) unsigned NOT NULL default '0',
+  mailed tinyint(2) unsigned NOT NULL default '0',
   subject varchar(255) NOT NULL default '',
   message text NOT NULL,
   format tinyint(2) NOT NULL default '0',
@@ -103,4 +103,3 @@ INSERT INTO prefix_log_display VALUES ('forum', 'view discussion', 'forum_discus
 INSERT INTO prefix_log_display VALUES ('forum', 'view forum', 'forum', 'name');
 INSERT INTO prefix_log_display VALUES ('forum', 'subscribe', 'forum', 'name');
 INSERT INTO prefix_log_display VALUES ('forum', 'unsubscribe', 'forum', 'name');
-

diff --git a/mod/forum/version.php b/mod/forum/version.php
index e1392704fc118b2fa6f527811c6d35eae290a0cb..dc239621027d88bd8a9c7a201b9c1f84e7d05f9a 100644 (file)
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -5,8 +5,8 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004012800;
-$module->requires = 2004012800;  // Requires this Moodle version
+$module->version  = 2004013000;
+$module->requires = 2004013000;  // Requires this Moodle version
 $module->cron     = 60;
 
 ?>