From cb24115c8ec11ce6d498ca29088a22a9ff18e332 Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Wed, 26 Apr 2006 05:48:04 +0000
Subject: [PATCH] trying to change all the default NULL fields to NOT NULL
 default '0'/'', hope i didn't mess up. Please report any bugs asap!

---
 backup/db/mysql.php       | 16 +++++++++---
 backup/db/mysql.sql       |  8 +++---
 backup/version.php        |  2 +-
 lib/db/mysql.php          | 54 ++++++++++++++++++++++++++++++++-------
 lib/db/mysql.sql          | 52 ++++++++++++++++++-------------------
 mod/hotpot/db/mysql.php   | 23 +++++++++++++++++
 mod/hotpot/db/mysql.sql   | 28 ++++++++++----------
 mod/hotpot/version.php    |  2 +-
 mod/journal/db/mysql.php  |  4 +++
 mod/journal/db/mysql.sql  |  4 +--
 mod/journal/version.php   |  2 +-
 mod/resource/db/mysql.php |  4 +++
 mod/resource/db/mysql.sql |  2 +-
 mod/resource/version.php  |  2 +-
 mod/survey/db/mysql.php   | 10 ++++++++
 mod/survey/db/mysql.sql   | 12 ++++-----
 mod/survey/version.php    |  2 +-
 mod/wiki/db/mysql.php     |  9 ++++++-
 mod/wiki/db/mysql.sql     |  4 +--
 mod/wiki/version.php      |  2 +-
 version.php               |  2 +-
 21 files changed, 169 insertions(+), 75 deletions(-)

diff --git a/backup/db/mysql.php b/backup/db/mysql.php
index faffb5b587..1fa25b2b3e 100644
--- a/backup/db/mysql.php
+++ b/backup/db/mysql.php
@@ -112,8 +112,8 @@ function backup_upgrade($oldversion=0) {
                           `backup_code` int(10) unsigned NOT NULL default '0',
                           `file_type` varchar(10) NOT NULL default '',
                           `path` varchar(255) NOT NULL default '',
-                          `old_id` int(10) unsigned default NULL,
-                          `new_id` int(10) unsigned default NULL,
+                          `old_id` int(10) unsigned NOT NULL default '0',
+                          `new_id` int(10) unsigned NOT NULL default '0',
                           PRIMARY KEY  (`id`),
                           UNIQUE KEY `{$CFG->prefix}backup_files_uk` (`backup_code`,`file_type`,`path`)
                       ) TYPE=MyISAM COMMENT='To store and recode ids to user and course files.'");
@@ -127,7 +127,7 @@ function backup_upgrade($oldversion=0) {
                           `backup_code` int(12) unsigned NOT NULL default '0',
                           `table_name` varchar(30) NOT NULL default '',
                           `old_id` int(10) unsigned NOT NULL default '0',
-                          `new_id` int(10) unsigned default NULL,
+                          `new_id` int(10) unsigned NOT NULL default '0',
                           `info` mediumtext,
                           PRIMARY KEY  (`id`),
                           UNIQUE KEY `{$CFG->prefix}backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
@@ -147,6 +147,16 @@ function backup_upgrade($oldversion=0) {
         $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_ids ADD UNIQUE INDEX backup_ids_uk(backup_code,table_name(30),old_id)");
     }
 
+    // chaing default nulls to not null default 0
+    
+    if ($oldversion < 2006042600) {
+
+        table_column('backup_files','old_id','old_id','int','10','unsigned','0','not null');
+        table_column('backup_files','new_id','new_id','int','10','unsigned','0','not null');
+        table_column('backup_ids','new_id','new_id','int','10','unsigned','0','not null');
+        table_column('backup_ids','info','info','mediumtext','','','','not null');
+    }
+
 
     //Finally, return result
     return $result;
diff --git a/backup/db/mysql.sql b/backup/db/mysql.sql
index d0d2bc6833..66c9359a7b 100644
--- a/backup/db/mysql.sql
+++ b/backup/db/mysql.sql
@@ -7,8 +7,8 @@ CREATE TABLE `prefix_backup_files` (
   `backup_code` int(10) unsigned NOT NULL default '0',
   `file_type` varchar(10) NOT NULL default '',
   `path` varchar(255) NOT NULL default '',
-  `old_id` int(10) unsigned default NULL,
-  `new_id` int(10) unsigned default NULL,
+  `old_id` int(10) unsigned NOT NULL default '0',
+  `new_id` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `backup_files_uk` (`backup_code`,`file_type`,`path`)
 ) TYPE=MyISAM COMMENT='To store and recode ids to user and course files.';
@@ -23,8 +23,8 @@ CREATE TABLE `prefix_backup_ids` (
   `backup_code` int(12) unsigned NOT NULL default '0',
   `table_name` varchar(30) NOT NULL default '',
   `old_id` int(10) unsigned NOT NULL default '0',
-  `new_id` int(10) unsigned default NULL,
-  `info` mediumtext,
+  `new_id` int(10) unsigned NOT NULL default '0',
+  `info` mediumtext NOT NULL default '',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
 ) TYPE=MyISAM COMMENT='To store and convert ids in backup/restore';
diff --git a/backup/version.php b/backup/version.php
index 60a479aecb..902fa42f86 100644
--- a/backup/version.php
+++ b/backup/version.php
@@ -5,6 +5,6 @@
 // database (backup_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)
 
-$backup_version = 2006042100;   // The current version is a date (YYYYMMDDXX)
+$backup_version = 2006042600;   // The current version is a date (YYYYMMDDXX)
 
 $backup_release = "1.6beta1";  // User-friendly version number
diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 785551ee6c..d781f92671 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -63,7 +63,7 @@ function main_upgrade($oldversion=0) {
         execute_sql(" ALTER TABLE `course` ADD `students` VARCHAR( 100 ) DEFAULT 'Students' NOT NULL AFTER `student` ");
     }
     if ($oldversion < 2002091000) {
-        execute_sql(" ALTER TABLE `user` CHANGE `personality` `secret` VARCHAR( 15 ) DEFAULT NULL  ");
+        execute_sql(" ALTER TABLE `user` CHANGE `personality` `secret` VARCHAR( 15 ) NOT NULL DEFAULT ''  ");
     }
     if ($oldversion < 2002091400) {
         execute_sql(" ALTER TABLE `user` ADD `lang` VARCHAR( 3 ) DEFAULT 'en' NOT NULL AFTER `country`  ");
@@ -1258,12 +1258,12 @@ function main_upgrade($oldversion=0) {
     if ($oldversion < 2005032800) {
         execute_sql("CREATE TABLE `{$CFG->prefix}grade_category` (
             `id` int(10) unsigned NOT NULL auto_increment,
-            `name` varchar(64) default NULL,
+            `name` varchar(64) NOT NULL default '',
             `courseid` int(10) unsigned NOT NULL default '0',
             `drop_x_lowest` int(10) unsigned NOT NULL default '0',
             `bonus_points` int(10) unsigned NOT NULL default '0',
             `hidden` int(10) unsigned NOT NULL default '0',
-            `weight` decimal(4,2) default '0.00',
+            `weight` decimal(4,2) NOT NULL default '0.00',
             PRIMARY KEY  (`id`),
             KEY `courseid` (`courseid`)
           ) TYPE=MyISAM ;");
@@ -1280,10 +1280,10 @@ function main_upgrade($oldversion=0) {
 
         execute_sql("CREATE TABLE `{$CFG->prefix}grade_item` (
             `id` int(10) unsigned NOT NULL auto_increment,
-            `courseid` int(10) unsigned default NULL,
-            `category` int(10) unsigned default NULL,
-            `modid` int(10) unsigned default NULL,
-            `cminstance` int(10) unsigned default NULL,
+            `courseid` int(10) unsigned NOT NULL default '0',
+            `category` int(10) unsigned NOT NULL default '0',
+            `modid` int(10) unsigned NOT NULL default '0',
+            `cminstance` int(10) unsigned NOT NULL default '0',
             `scale_grade` float(11,10) default '1.0000000000',
             `extra_credit` int(10) unsigned NOT NULL default '0',
             `sort_order` int(10) unsigned NOT NULL default '0',
@@ -1305,7 +1305,7 @@ function main_upgrade($oldversion=0) {
 
         execute_sql("CREATE TABLE `{$CFG->prefix}grade_preferences` (
             `id` int(10) unsigned NOT NULL auto_increment,
-            `courseid` int(10) unsigned default NULL,
+            `courseid` int(10) unsigned NOT NULL default '0',
             `preference` int(10) NOT NULL default '0',
             `value` int(10) NOT NULL default '0',
             PRIMARY KEY  (`id`),
@@ -1834,7 +1834,43 @@ function main_upgrade($oldversion=0) {
         modify_database('',"ALTER TABLE prefix_tags ADD INDEX tags_typeuserid_idx (type(20), userid)");
         modify_database('',"ALTER TABLE prefix_tags ADD INDEX tags_text_idx(text(255))");
     }
-
+    
+    /***************************************************
+     * The following is an effort to change all the    *
+     * default NULLs to NOT NULL defaut '' in all      *
+     * mysql tables, to prevent 5303 and be consistent *
+     ***************************************************/
+
+    if ($oldversion < 2006042600) {
+
+        table_column('grade_category','name','name','varchar','64','','','not null');
+        execute_sql("ALTER TABLE {$CFG->prefix}grade_category change weight weight decimal(5,2) NOT NULL default 0.00");
+        table_column('grade_item','courseid','courseid','int','10','unsigned','0','not null');
+        table_column('grade_item','category','category','int','10','unsigned','0','not null');
+        table_column('grade_item','modid','modid','int','10','unsigned','0','not null');
+        table_column('grade_item','cminstance','cminstance','int','10','unsigned','0','not null');
+        execute_sql("ALTER TABLE {$CFG->prefix}grade_item change scale_grade scale_grade float(11,10) NOT NULL default 1.0000000000");
+        table_column('grade_preferences','courseid','courseid','int','10','unsigned','0','not null');
+        table_column('user','idnumber','idnumber','varchar','64','','','not null');
+        table_column('user','icq','icq','varchar','15','','','not null');
+        table_column('user','skype','skype','varchar','50','','','not null');
+        table_column('user','yahoo','yahoo','varchar','50','','','not null');
+        table_column('user','aim','aim','varchar','50','','','not null');
+        table_column('user','msn','msn','varchar','50','','','not null');
+        table_column('user','phone1','phone1','varchar','20','','','not null');
+        table_column('user','phone2','phone2','varchar','20','','','not null');
+        table_column('user','institution','institution','varchar','40','','','not null');
+        table_column('user','department','department','varchar','30','','','not null');
+        table_column('user','address','address','varchar','70','','','not null');
+        table_column('user','city','city','varchar','20','','','not null');
+        table_column('user','country','country','char','2','','','not null');
+        table_column('user','lang','lang','varchar','10','','en','not null');
+        table_column('user','lastIP','lastIP','varchar','15','','','not null');
+        table_column('user','secret','secret','varchar','15','','','not null');
+        table_column('user','picture','picture','tinyint','1','','0','not null');
+        table_column('user','url','url','varchar','255','','','not null');
+    }
+    
     return $result;
 }
 
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 26bdb9aa8b..3eaf44c6df 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -287,12 +287,12 @@ CREATE TABLE `prefix_cache_text` (
 
 CREATE TABLE `prefix_grade_category` (
   `id` int(10) unsigned NOT NULL auto_increment,
-  `name` varchar(64) default NULL,
+  `name` varchar(64) NOT NULL default '',
   `courseid` int(10) unsigned NOT NULL default '0',
   `drop_x_lowest` int(10) unsigned NOT NULL default '0',
   `bonus_points` int(10) unsigned NOT NULL default '0',
   `hidden` int(10) unsigned NOT NULL default '0',
-  `weight` decimal(5,2) default '0.00',
+  `weight` decimal(5,2) NOT NULL default '0.00',
   PRIMARY KEY  (`id`),
   KEY `courseid` (`courseid`)
 ) TYPE=MyISAM ;
@@ -320,11 +320,11 @@ CREATE TABLE `prefix_grade_exceptions` (
 
 CREATE TABLE `prefix_grade_item` (
   `id` int(10) unsigned NOT NULL auto_increment,
-  `courseid` int(10) unsigned default NULL,
-  `category` int(10) unsigned default NULL,
-  `modid` int(10) unsigned default NULL,
-  `cminstance` int(10) unsigned default NULL,
-  `scale_grade` float(11,10) default '1.0000000000',
+  `courseid` int(10) unsigned NOT NULL default '0',
+  `category` int(10) unsigned NOT NULL default '0',
+  `modid` int(10) unsigned NOT NULL default '0',
+  `cminstance` int(10) unsigned NOT NULL default '0',
+  `scale_grade` float(11,10) NOT NULL default '1.0000000000',
   `extra_credit` int(10) unsigned NOT NULL default '0',
   `sort_order` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
@@ -355,7 +355,7 @@ CREATE TABLE `prefix_grade_letter` (
 
 CREATE TABLE `prefix_grade_preferences` (
   `id` int(10) unsigned NOT NULL auto_increment,
-  `courseid` int(10) unsigned default NULL,
+  `courseid` int(10) unsigned NOT NULL default '0',
   `preference` int(10) NOT NULL default '0',
   `value` int(10) NOT NULL default '0',
   PRIMARY KEY  (`id`),
@@ -585,34 +585,34 @@ CREATE TABLE `prefix_user` (
   `deleted` tinyint(1) NOT NULL default '0',
   `username` varchar(100) NOT NULL default '',
   `password` varchar(32) NOT NULL default '',
-  `idnumber` varchar(64) default NULL,
+  `idnumber` varchar(64) NOT NULL default '',
   `firstname` varchar(100) NOT NULL default '',
   `lastname` varchar(100) NOT NULL default '',
   `email` varchar(100) NOT NULL default '',
   `emailstop` tinyint(1) unsigned NOT NULL default '0',
-  `icq` varchar(15) default NULL,
-  `skype` varchar(50) default NULL,
-  `yahoo` varchar(50) default NULL,
-  `aim` varchar(50) default NULL,
-  `msn` varchar(50) default NULL,
-  `phone1` varchar(20) default NULL,
-  `phone2` varchar(20) default NULL,
-  `institution` varchar(40) default NULL,
-  `department` varchar(30) default NULL,
-  `address` varchar(70) default NULL,
-  `city` varchar(20) default NULL,
-  `country` char(2) default NULL,
-  `lang` varchar(10) default 'en',
+  `icq` varchar(15) NOT NULL default '',
+  `skype` varchar(50) NOT NULL default '',
+  `yahoo` varchar(50) NOT NULL default '',
+  `aim` varchar(50) NOT NULL default '',
+  `msn` varchar(50) NOT NULL default '',
+  `phone1` varchar(20) NOT NULL default '',
+  `phone2` varchar(20) NOT NULL default '',
+  `institution` varchar(40) NOT NULL default '',
+  `department` varchar(30) NOT NULL default '',
+  `address` varchar(70) NOT NULL default '',
+  `city` varchar(20) NOT NULL default '',
+  `country` char(2) NOT NULL default '',
+  `lang` varchar(10) NOT NULL default 'en',
   `theme` varchar(50) NOT NULL default '',
   `timezone` varchar(100) NOT NULL default '99',
   `firstaccess` int(10) unsigned NOT NULL default '0',
   `lastaccess` int(10) unsigned NOT NULL default '0',
   `lastlogin` int(10) unsigned NOT NULL default '0',
   `currentlogin` int(10) unsigned NOT NULL default '0',
-  `lastIP` varchar(15) default NULL,
-  `secret` varchar(15) default NULL,
-  `picture` tinyint(1) default NULL,
-  `url` varchar(255) default NULL,
+  `lastIP` varchar(15) NOT NULL default '',
+  `secret` varchar(15) NOT NULL default '',
+  `picture` tinyint(1) NOT NULL default '0',
+  `url` varchar(255) NOT NULL default '',
   `description` text NOT NULL default '',
   `mailformat` tinyint(1) unsigned NOT NULL default '1',
   `maildigest` tinyint(1) unsigned NOT NULL default '0',
diff --git a/mod/hotpot/db/mysql.php b/mod/hotpot/db/mysql.php
index 17ceb3b197..23fe22d6c4 100644
--- a/mod/hotpot/db/mysql.php
+++ b/mod/hotpot/db/mysql.php
@@ -26,6 +26,29 @@ function hotpot_upgrade($oldversion) {
 		$ok = $ok && hotpot_get_update_to_v2();
 		$ok = $ok && hotpot_update_to_v2_1_16();
 	}
+
+
+    if ($oldversion < 2006042600) {
+        table_column('hotpot_attempts','starttime','starttime','int','10','unsigned','0','not null');
+        table_column('hotpot_attempts','endtime','endtime','int','10','unsigned','0','not null');
+        table_column('hotpot_attempts','score','score','int','6','unsigned','0','not null');
+        table_column('hotpot_attempts','penalties','penalties','int','6','unsigned','0','not null');
+        table_column('hotpot_attempts','timestart','timestart','int','10','unsigned','0','not null');
+        table_column('hotpot_attempts','timefinish','timefinish','int','10','unsigned','0','not null');
+        table_column('hotpot_attempts','clickreportid','clickreportid','int','10','unsigned','0','not null');
+        
+        execute_sql("ALTER TABLE {$CFG->prefix}hotpot_questions CHANGE type type tinyint(4) unsigned NOT NULL default '0'");
+
+        table_column('hotpot_questions','text','text','int','10','unsigned','0','not null');
+        
+        
+        execute_sql("ALTER TABLE {$CFG->prefix}hotpot_responses CHANGE weighting weighting smallint(8) unsigned NOT NULL default '0'");
+        execute_sql("ALTER TABLE {$CFG->prefix}hotpot_responses CHANGE score score smallint(8) unsigned NOT NULL default '0'");
+        execute_sql("ALTER TABLE {$CFG->prefix}hotpot_responses CHANGE hints hints smallint(6) unsigned NOT NULL default '0'");
+        execute_sql("ALTER TABLE {$CFG->prefix}hotpot_responses CHANGE clues clues smallint(6) unsigned NOT NULL default '0'");
+        execute_sql("ALTER TABLE {$CFG->prefix}hotpot_responses CHANGE checks checks smallint(6) unsigned NOT NULL default '0'");
+
+    }
 	
 	return $ok;
 }
diff --git a/mod/hotpot/db/mysql.sql b/mod/hotpot/db/mysql.sql
index a937dec760..635ba00b41 100644
--- a/mod/hotpot/db/mysql.sql
+++ b/mod/hotpot/db/mysql.sql
@@ -34,15 +34,15 @@ CREATE TABLE prefix_hotpot_attempts (
     id int(10) unsigned NOT NULL auto_increment,
     hotpot int(10) unsigned NOT NULL default '0',
     userid int(10) unsigned NOT NULL default '0',
-    starttime int(10) unsigned default NULL,
-    endtime int(10) unsigned default NULL,
-    score int(6) unsigned default NULL,
-    penalties int(6) unsigned default NULL,
+    starttime int(10) unsigned NOT NULL default '0',
+    endtime int(10) unsigned NOT NULL default '0',
+    score int(6) unsigned NOT NULL default '0',
+    penalties int(6) unsigned NOT NULL default '0',
     attempt int(6) unsigned NOT NULL default '0',
-    timestart int(10) unsigned default NULL,
-    timefinish int(10) unsigned default NULL,
+    timestart int(10) unsigned NOT NULL default '0',
+    timefinish int(10) unsigned NOT NULL default '0',
     status tinyint(4) unsigned NOT NULL default '1',
-    clickreportid int(10) unsigned default NULL,
+    clickreportid int(10) unsigned NOT NULL default '0',
     PRIMARY KEY (id),
     KEY hotpot_attempts_hotpot_idx (hotpot),
     KEY hotpot_attempts_userid_idx (userid)
@@ -63,8 +63,8 @@ CREATE TABLE prefix_hotpot_details (
 CREATE TABLE prefix_hotpot_questions (
     id int(10) unsigned NOT NULL auto_increment,
     name text NOT NULL default '',
-    type tinyint(4) unsigned default NULL,
-    text int(10) unsigned default NULL,
+    type tinyint(4) unsigned NOT NULL default '0',
+    text int(10) unsigned NOT NULL default '0',
     hotpot int(10) unsigned NOT NULL default '0',
     PRIMARY KEY (id),
     KEY hotpot_questions_name_idx (name(20)),
@@ -77,14 +77,14 @@ CREATE TABLE prefix_hotpot_responses (
     id int(10) unsigned NOT NULL auto_increment,
     attempt int(10) unsigned NOT NULL default '0',
     question int(10) unsigned NOT NULL default '0',
-    score smallint(8) default NULL,
-    weighting smallint(8) default NULL,
+    score smallint(8) unsigned NOT NULL default '0',
+    weighting smallint(8) unsigned NOT NULL default '0',
     correct varchar(255) NOT NULL default '',
     wrong varchar(255) NOT NULL default '',
     ignored varchar(255) NOT NULL default '',
-    hints smallint(6) default NULL,
-    clues smallint(6) default NULL,
-    checks smallint(6) default NULL,
+    hints smallint(6) unsigned NOT NULL default '0',
+    clues smallint(6) unsigned NOT NULL default '0',
+    checks smallint(6) unsigned NOT NULL default '0',
     PRIMARY KEY (id),
     KEY hotpot_responses_attempt_idx (attempt),
     KEY hotpot_responses_question_idx (question)
diff --git a/mod/hotpot/version.php b/mod/hotpot/version.php
index 87e28204bc..dd2f861018 100644
--- a/mod/hotpot/version.php
+++ b/mod/hotpot/version.php
@@ -3,7 +3,7 @@
 ///  Code fragment to define the version of hotpot
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
-$module->version  = 2006042103;  // release date of this version (see note below)
+$module->version  = 2006042600;  // release date of this version (see note below)
 $module->release  = 'v2.1.16';    // human-friendly version name (used in mod/hotpot/lib.php)
 $module->cron     = 0;           // period for cron to check this module (secs)
 // interpretation of YYYYMMDDXY version numbers
diff --git a/mod/journal/db/mysql.php b/mod/journal/db/mysql.php
index fd03952fa0..b5efd622cc 100644
--- a/mod/journal/db/mysql.php
+++ b/mod/journal/db/mysql.php
@@ -69,6 +69,10 @@ function journal_upgrade($oldversion) {
         $wtm->update( 'journal_entries', 'text', 'format', $sql );
     }
 
+    if ($oldversion < 2006042600) {
+        table_column('journal','name','name','varchar','255','','','not null');
+        table_column('journal','intro','intro','text','','','','not null');
+    }
     return $result;
 }
 
diff --git a/mod/journal/db/mysql.sql b/mod/journal/db/mysql.sql
index 2a21745dd2..e2db93b8c2 100755
--- a/mod/journal/db/mysql.sql
+++ b/mod/journal/db/mysql.sql
@@ -17,8 +17,8 @@
 CREATE TABLE prefix_journal (
   id int(10) unsigned NOT NULL auto_increment,
   course int(10) unsigned NOT NULL default '0',
-  name varchar(255) default NULL,
-  intro text default '',
+  name varchar(255) NOT NULL default '',
+  intro text NOT NULL default '',
   introformat tinyint(2) NOT NULL default '0',
   days smallint(5) unsigned NOT NULL default '7',
   assessed int(10) NOT NULL default '0',
diff --git a/mod/journal/version.php b/mod/journal/version.php
index e85d4d8164..03f3b719a4 100644
--- a/mod/journal/version.php
+++ b/mod/journal/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2005041100;
+$module->version  = 2006042600;
 $module->requires = 2005031000;  // Requires this Moodle version
 $module->cron     = 60;
 
diff --git a/mod/resource/db/mysql.php b/mod/resource/db/mysql.php
index 9eb0d0ebd9..94b9b9978f 100644
--- a/mod/resource/db/mysql.php
+++ b/mod/resource/db/mysql.php
@@ -64,6 +64,10 @@ function resource_upgrade($oldversion) {
         $wtm = new WikiToMarkdown();
         $wtm->update( 'resource','alltext','options' );
     }
+    
+    if ($oldversion < 2006042600) {
+        table_column('resource','reference','reference','varchar','255','','','not null');
+    }
 
     return true;
 }
diff --git a/mod/resource/db/mysql.sql b/mod/resource/db/mysql.sql
index 75274e4106..adc08a4a3f 100755
--- a/mod/resource/db/mysql.sql
+++ b/mod/resource/db/mysql.sql
@@ -19,7 +19,7 @@ CREATE TABLE prefix_resource (
   course int(10) unsigned NOT NULL default '0',
   name varchar(255) NOT NULL default '',
   type varchar(30) NOT NULL default '',
-  reference varchar(255) default NULL,
+  reference varchar(255) NOT NULL default '',
   summary text NOT NULL default '',
   alltext text NOT NULL default '',
   popup text NOT NULL default '',
diff --git a/mod/resource/version.php b/mod/resource/version.php
index 64b6869260..4ccf372075 100644
--- a/mod/resource/version.php
+++ b/mod/resource/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2005041100;
+$module->version  = 2006042600;
 $module->requires = 2005021600;  // Requires this Moodle version
 $module->cron     = 0;
 
diff --git a/mod/survey/db/mysql.php b/mod/survey/db/mysql.php
index 2ad0a61488..9ff8a461d2 100644
--- a/mod/survey/db/mysql.php
+++ b/mod/survey/db/mysql.php
@@ -192,6 +192,16 @@ function survey_upgrade($oldversion) {
         modify_database('','ALTER TABLE prefix_survey_answers ADD INDEX survey (survey);');
         modify_database('','ALTER TABLE prefix_survey_answers ADD INDEX question (question);');
     }
+    
+    if ($oldversion < 2006042600) {
+
+        table_column('survey','questions','questions','varchar','255','','','not null');
+        table_column('survey','intro','intro','text','','','','not null');
+        table_column('survey_answers','time','time','int','10','unsigned','0','not null');
+        table_column('survey_answers','answer1','answer1','text','','','','not null');
+        table_column('survey_answers','answer2','answer2','text','','','','not null');
+        table_column('survey_questions','intro','intro','varchar','50','','','not null');
+    }
 
     return true;
 }
diff --git a/mod/survey/db/mysql.sql b/mod/survey/db/mysql.sql
index bdba5bf730..0e5ef6b42a 100755
--- a/mod/survey/db/mysql.sql
+++ b/mod/survey/db/mysql.sql
@@ -22,8 +22,8 @@ CREATE TABLE prefix_survey (
   timecreated int(10) unsigned NOT NULL default '0',
   timemodified int(10) unsigned NOT NULL default '0',
   name varchar(255) NOT NULL default '',
-  intro text default '',
-  questions varchar(255) default NULL,
+  intro text NOT NULL default '',
+  questions varchar(255) NOT NULL default '',
   PRIMARY KEY  (id), 
   KEY `course` (`course`)
 ) TYPE=MyISAM COMMENT='all surveys';
@@ -70,9 +70,9 @@ CREATE TABLE prefix_survey_answers (
   userid int(10) unsigned NOT NULL default '0',
   survey int(10) unsigned NOT NULL default '0',
   question int(10) unsigned NOT NULL default '0',
-  time int(10) unsigned default NULL,
-  answer1 text default NULL,
-  answer2 text default NULL,
+  time int(10) unsigned NOT NULL default '0',
+  answer1 text NOT NULL default '',
+  answer2 text NOT NULL default '',
   PRIMARY KEY  (id),
   UNIQUE KEY id (id),
   KEY userid (userid),
@@ -95,7 +95,7 @@ CREATE TABLE `prefix_survey_questions` (
   `text` varchar(255) NOT NULL default '',
   `shorttext` varchar(30) NOT NULL default '',
   `multi` varchar(100) NOT NULL default '',
-  `intro` varchar(50) default NULL,
+  `intro` varchar(50) NOT NULL default '',
   `type` tinyint(3) NOT NULL default '0',
   `options` text,
   PRIMARY KEY  (`id`)
diff --git a/mod/survey/version.php b/mod/survey/version.php
index 7cdea8ed4e..cffdf60761 100644
--- a/mod/survey/version.php
+++ b/mod/survey/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2005031600;
+$module->version  = 2006042600;
 $module->requires = 2005031000;  // Requires this Moodle version
 $module->cron     = 0;
 
diff --git a/mod/wiki/db/mysql.php b/mod/wiki/db/mysql.php
index 8396bfeed8..8cc6860d91 100644
--- a/mod/wiki/db/mysql.php
+++ b/mod/wiki/db/mysql.php
@@ -27,7 +27,7 @@ function wiki_upgrade($oldversion) {
     }
 
     if ($oldversion < 2004053100) {
-        execute_sql('ALTER TABLE `'.$CFG->prefix.'wiki` CHANGE `initialcontent` `initialcontent` VARCHAR( 255 ) DEFAULT NULL');
+        execute_sql('ALTER TABLE `'.$CFG->prefix.'wiki` CHANGE `initialcontent` `initialcontent` VARCHAR( 255 ) NOT NULL DEFAULT \'\'');
 //      Remove obsolete 'initialcontent' values.
         if ($wikis = get_records('wiki')) {
             foreach ($wikis as $wiki) {
@@ -149,6 +149,13 @@ function wiki_upgrade($oldversion) {
         }
     }
 
+    if ($oldversion < 2006042600) {
+
+        table_column('wiki','summary','summary','text','','','','not null');
+        table_column('wiki','pagename','pagename','varchar','255','','','not null');
+        table_column('wiki','initialcontent','initialcontent','varchar','255','','','not null');
+    }
+
     return true;
 }
 
diff --git a/mod/wiki/db/mysql.sql b/mod/wiki/db/mysql.sql
index b1f583bb23..f69b494a56 100644
--- a/mod/wiki/db/mysql.sql
+++ b/mod/wiki/db/mysql.sql
@@ -10,7 +10,7 @@ CREATE TABLE `prefix_wiki` (
   `course` int(10) unsigned NOT NULL default '0',
   `name` varchar(255) NOT NULL default '',
   `summary` text NOT NULL default '',
-  `pagename` varchar(255) default NULL,
+  `pagename` varchar(255) NOT NULL default '',
   `wtype` enum('teacher','group','student') NOT NULL default 'group',
   `ewikiprinttitle` tinyint(4) NOT NULL default '1',
   `htmlmode` tinyint(4) NOT NULL default '0',
@@ -20,7 +20,7 @@ CREATE TABLE `prefix_wiki` (
   `strippages` tinyint(4) NOT NULL default '1',
   `removepages` tinyint(4) NOT NULL default '1',
   `revertchanges` tinyint(4) NOT NULL default '1',
-  `initialcontent` varchar(255) default NULL,
+  `initialcontent` varchar(255) NOT NULL default '',
   `timemodified` int(10) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `course` (`course`)
diff --git a/mod/wiki/version.php b/mod/wiki/version.php
index 25d2b49938..6ca24ba6b6 100644
--- a/mod/wiki/version.php
+++ b/mod/wiki/version.php
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2006032900;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2006042600;  // The current module version (Date: YYYYMMDDXX)
 $module->requires = 2005031000;  // The current module version (Date: YYYYMMDDXX)
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
diff --git a/version.php b/version.php
index 5319f800a1..1c4a10ad28 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 = 2006042401;  // YYYYMMDD = date
+   $version = 2006042600;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.6 Beta 3';    // Human-friendly version name
-- 
2.39.5