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

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 21db356233c65552f540ec255cb606b5ef073253..b0e3c18c19b0f6de134bf17d47e11dcf3fc3f411 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2177,6 +2177,10 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE {$CFG->prefix}course_categories CHANGE description description text NULL AFTER name");
     }
 
+    if ($oldversion < 2006083102) {
+        execute_sql("ALTER TABLE {$CFG->prefix}user CHANGE description description text NULL AFTER url");
+    }
+
     return $result;
 }
 

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 7dadbf97b30c1266ba510aeb7ec47d0e4692f53d..d67d027561b9ecd9a8bf5590dbda8ce606894124 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -615,7 +615,7 @@ CREATE TABLE `prefix_user` (
   `secret` varchar(15) NOT NULL default '',
   `picture` tinyint(1) NOT NULL default '0',
   `url` varchar(255) NOT NULL default '',
-  `description` text NOT NULL default '',
+  `description` text,
   `mailformat` tinyint(1) unsigned NOT NULL default '1',
   `maildigest` tinyint(1) unsigned NOT NULL default '0',
   `maildisplay` tinyint(2) unsigned NOT NULL default '2',

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

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