Merged from MOODLE_17_STABLE: fixed the journal upgrade. renaming a null column to...

diff --git a/mod/journal/db/mysql.php b/mod/journal/db/mysql.php
index 989c00da137ae16814debf1fae964b799cef9b47..37c34dfc9fa45d810dd66d8c3abd6e181eabade0 100644 (file)
--- a/mod/journal/db/mysql.php
+++ b/mod/journal/db/mysql.php
@@ -83,7 +83,7 @@ function journal_upgrade($oldversion) {
     }
 
     if ($oldversion < 2006092100) {
-        table_column('journal_entries', 'comment', 'entrycomment', 'text', '', '', '');
+        table_column('journal_entries', 'comment', 'entrycomment', 'text', '', '', '', 'null');
     }
 
     //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.

diff --git a/mod/journal/db/postgres7.php b/mod/journal/db/postgres7.php
index 1fa74e6312fb55ae11e93f1672ba4656272428f6..9064b093cddbb1c6091a15a022e531563cbeff79 100644 (file)
--- a/mod/journal/db/postgres7.php
+++ b/mod/journal/db/postgres7.php
@@ -58,7 +58,7 @@ function journal_upgrade($oldversion) {
     }
 
     if ($oldversion < 2006092100) {
-        table_column('journal_entries', 'comment', 'entrycomment', 'text', '', '', '');
+        table_column('journal_entries', 'comment', 'entrycomment', 'text', '', '', '', 'null');
     } 
 
     //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.