From: mjollnir_ <mjollnir_>
Date: Tue, 7 Nov 2006 00:09:37 +0000 (+0000)
Subject: Merged from MOODLE_17_STABLE: fixed the journal upgrade. renaming a null column to... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d3674ed965bac49ade4475ad804465ebaa53d671;p=moodle.git

Merged from MOODLE_17_STABLE: fixed the journal upgrade. renaming a null column to not null is unhappy
---

diff --git a/mod/journal/db/mysql.php b/mod/journal/db/mysql.php
index 989c00da13..37c34dfc9f 100644
--- 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 1fa74e6312..9064b093cd 100644
--- 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.