course_categories->description can be NULLable (experimenting....)

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 6463fd411cddd8799762e8555e23e9b7b3cb044d..21db356233c65552f540ec255cb606b5ef073253 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2173,6 +2173,10 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE {$CFG->prefix}course CHANGE modinfo modinfo longtext NULL AFTER showgrades");
     }
 
+    if ($oldversion < 2006083101) {
+        execute_sql("ALTER TABLE {$CFG->prefix}course_categories CHANGE description description text NULL AFTER name");
+    }
+
     return $result;
 }
 

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index bea4385149df23c8fd70da51011118cf44effe0c..7dadbf97b30c1266ba510aeb7ec47d0e4692f53d 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -100,7 +100,7 @@ CREATE TABLE `prefix_course` (
 CREATE TABLE `prefix_course_categories` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `name` varchar(255) NOT NULL default '',
-  `description` text NOT NULL default '',
+  `description` text,
   `parent` int(10) unsigned NOT NULL default '0',
   `sortorder` int(10) unsigned NOT NULL default '0',
   `coursecount` int(10) unsigned NOT NULL default '0',

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 8796ba1a30ffc89668647031465078b7686f8284..b8638e427495ce419c37f8a596ef760a90feab70 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1769,6 +1769,11 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE {$CFG->prefix}course ALTER COLUMN modinfo DROP DEFAULT");
     }
 
+    if ($oldversion < 2006083101) {
+        execute_sql("ALTER TABLE {$CFG->prefix}course_categories ALTER COLUMN description DROP NOT NULL");
+        execute_sql("ALTER TABLE {$CFG->prefix}course_categories ALTER COLUMN description DROP DEFAULT");
+    }
+
     return $result;
 }
 

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index e4f6c32aeba6bc7dafc955ca9d37afacd0d2fad0..4c0295306bd2f4469dd88c0c7d477ac690c63135 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -66,7 +66,7 @@ CREATE INDEX prefix_course_shortname_idx ON prefix_course (shortname);
 CREATE TABLE prefix_course_categories (
    id SERIAL PRIMARY KEY,
    name varchar(255) NOT NULL default '',
-   description text NOT NULL default '',
+   description text,
    parent integer NOT NULL default '0',
    sortorder integer NOT NULL default '0',
    coursecount integer NOT NULL default '0',
@@ -779,4 +779,4 @@ INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('message'
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('message', 'add contact', 'user', 'firstname||\' \'||lastname');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('message', 'remove contact', 'user', 'firstname||\' \'||lastname');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('message', 'block contact', 'user', 'firstname||\' \'||lastname');
-INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('message', 'unblock contact', 'user', 'firstname||\' \'||lastname');
\ No newline at end of file
+INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('message', 'unblock contact', 'user', 'firstname||\' \'||lastname');

diff --git a/version.php b/version.php
index 940ecfbf82b447873b2ff8c37e080ab527669525..507e285f2177a5f26ebaeba58abb549cd6cd7daa 100644 (file)
--- 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 = 2006083100;  // YYYYMMDD = date
+   $version = 2006083101;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name