From 6c76032bc17f30dcd53fbc3955050585d19c6cb5 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Thu, 31 Aug 2006 23:17:23 +0000
Subject: [PATCH] course_categories->description can be NULLable
 (experimenting....)

---
 lib/db/mysql.php     | 4 ++++
 lib/db/mysql.sql     | 2 +-
 lib/db/postgres7.php | 5 +++++
 lib/db/postgres7.sql | 4 ++--
 version.php          | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 6463fd411c..21db356233 100644
--- 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 bea4385149..7dadbf97b3 100644
--- 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 8796ba1a30..b8638e4274 100644
--- 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 e4f6c32aeb..4c0295306b 100644
--- 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 940ecfbf82..507e285f21 100644
--- 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
-- 
2.39.5