merged fix for 5428

diff --git a/mod/data/db/mysql.php b/mod/data/db/mysql.php
index 1403b41971ea966c5f0c5f5ccef97e7047299ac4..3185768589256a33cb8f8a8c077addab99cb1396 100644 (file)
--- a/mod/data/db/mysql.php
+++ b/mod/data/db/mysql.php
@@ -49,6 +49,21 @@ function data_upgrade($oldversion) {
         table_column('data', '', 'csstemplate', 'text', '', '', '', 'not null', 'rsstemplate');
     }
     
+    if ($oldversion < 2006050500) { // 2 fields have got no default null values
+        table_column('data_comments','content','content','text','','','','not null');
+        table_column('data_fields','description','description','text','','','','not null');
+        table_column('data_fields','param1','param1','text','','','','not null');
+        table_column('data_fields','param2','param2','text','','','','not null');
+        table_column('data_fields','param3','param3','text','','','','not null');
+        table_column('data_fields','param4','param4','text','','','','not null');
+        table_column('data_fields','param5','param5','text','','','','not null');
+        table_column('data_fields','param6','param6','text','','','','not null');
+        table_column('data_fields','param7','param7','text','','','','not null');
+        table_column('data_fields','param8','param8','text','','','','not null');
+        table_column('data_fields','param9','param9','text','','','','not null');
+        table_column('data_fields','param10','param10','text','','','','not null');
+    }
+    
     return true;
 }
 

diff --git a/mod/data/db/mysql.sql b/mod/data/db/mysql.sql
index fb855fdcd53a9abf9aed460353d334a186611265..24d671a6a3cb48ccdf293cc467adec18fc7b5670 100755 (executable)
--- a/mod/data/db/mysql.sql
+++ b/mod/data/db/mysql.sql
@@ -62,17 +62,17 @@ CREATE TABLE prefix_data_fields (
   dataid int(10) unsigned NOT NULL default '0',
   type varchar(255) NOT NULL default '',
   name varchar(255) NOT NULL default '',
-  description text default '',
-  param1  text default '',
-  param2  text default '',
-  param3  text default '',
-  param4  text default '',
-  param5  text default '',
-  param6  text default '',
-  param7  text default '',
-  param8  text default '',
-  param9  text default '',
-  param10 text default '',
+  description text NOT NULL default '',
+  param1  text NOT NULL default '',
+  param2  text NOT NULL default '',
+  param3  text NOT NULL default '',
+  param4  text NOT NULL default '',
+  param5  text NOT NULL default '',
+  param6  text NOT NULL default '',
+  param7  text NOT NULL default '',
+  param8  text NOT NULL default '',
+  param9  text NOT NULL default '',
+  param10 text NOT NULL default '',
   PRIMARY KEY  (id)
 ) TYPE=MyISAM;
 
@@ -93,7 +93,7 @@ CREATE TABLE prefix_data_comments (
   id int(10) unsigned NOT NULL auto_increment,
   userid int(10) unsigned NOT NULL default '0',
   recordid int(10) unsigned NOT NULL default '0',
-  content text default '',
+  content text NOT NULL default '',
   created int(10) unsigned NOT NULL default '0',
   modified int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (id)

diff --git a/mod/data/db/postgres7.php b/mod/data/db/postgres7.php
index a0977e758aa47af810e9d8b8affeda405be37448..ca9fd6a938a1e2b1b21a6a418b8510e4c8410e16 100644 (file)
--- a/mod/data/db/postgres7.php
+++ b/mod/data/db/postgres7.php
@@ -50,6 +50,104 @@ function data_upgrade($oldversion) {
         table_column('data', '', 'csstemplate', 'text', '', '', '', 'not null', 'rsstemplate');
     }
     
+    if ($oldversion < 2006050500) { // drop all tables, and create from scratch
+
+        execute_sql("DROP TABLE {$CFG->prefix}data", false);
+        execute_sql("DROP TABLE {$CFG->prefix}data_content", false);
+        execute_sql("DROP TABLE {$CFG->prefix}data_fields", false);
+        execute_sql("DROP TABLE {$CFG->prefix}data_records", false);
+        execute_sql("DROP TABLE {$CFG->prefix}data_comments", false);
+        execute_sql("DROP TABLE {$CFG->prefix}data_ratings", false);
+
+        modify_database('',"CREATE TABLE prefix_data (
+                              id SERIAL PRIMARY KEY,
+                              course integer NOT NULL default '0',
+                              name varchar(255) NOT NULL default '',
+                              intro text NOT NULL default '',
+                              ratings integer NOT NULL default '0',
+                              comments integer NOT NULL default '0',
+                              timeavailablefrom integer NOT NULL default '0',
+                              timeavailableto integer NOT NULL default '0',
+                              timeviewfrom integer NOT NULL default '0',
+                              timeviewto integer NOT NULL default '0',
+                              participants integer NOT NULL default '0',
+                              requiredentries integer NOT NULL default '0',
+                              requiredentriestoview integer NOT NULL default '0',
+                              maxentries integer NOT NULL default '0',
+                              rssarticles integer NOT NULL default '0',
+                              singletemplate text NOT NULL default '',
+                              listtemplate text NOT NULL default '',
+                              listtemplateheader text NOT NULL default '',
+                              listtemplatefooter text NOT NULL default '',
+                              addtemplate text NOT NULL default '',
+                              rsstemplate text NOT NULL default '',
+                              csstemplate text NOT NULL default '',
+                              approval integer NOT NULL default '0',
+                              scale integer NOT NULL default '0',
+                              assessed integer NOT NULL default '0',
+                              assesspublic integer NOT NULL default '0',
+                              defaultsort integer NOT NULL default '0',
+                              defaultsortdir integer NOT NULL default '0',
+                              editany integer NOT NULL default '0'
+                            );
+
+                            CREATE TABLE prefix_data_content (
+                              id SERIAL PRIMARY KEY,
+                              fieldid integer NOT NULL default '0',
+                              recordid integer NOT NULL default '0',
+                              content text NOT NULL default '',
+                              content1 text NOT NULL default '',
+                              content2 text NOT NULL default '',
+                              content3 text NOT NULL default '',
+                              content4 text NOT NULL default ''
+                            );
+
+                            CREATE TABLE prefix_data_fields (
+                              id SERIAL PRIMARY KEY,
+                              dataid integer NOT NULL default '0',
+                              type varchar(255) NOT NULL default '',
+                              name varchar(255) NOT NULL default '',
+                              description text NOT NULL default '',
+                              param1  text NOT NULL default '',
+                              param2  text NOT NULL default '',
+                              param3  text NOT NULL default '',
+                              param4  text NOT NULL default '',
+                              param5  text NOT NULL default '',
+                              param6  text NOT NULL default '',
+                              param7  text NOT NULL default '',
+                              param8  text NOT NULL default '',
+                              param9  text NOT NULL default '',
+                              param10 text NOT NULL default ''
+                            );
+
+                            CREATE TABLE prefix_data_records (
+                              id SERIAL PRIMARY KEY,
+                              userid integer NOT NULL default '0',
+                              groupid integer NOT NULL default '0',
+                              dataid integer NOT NULL default '0',
+                              timecreated integer NOT NULL default '0',
+                              timemodified integer NOT NULL default '0',
+                              approved integer NOT NULL default '0'
+                            );
+
+                            CREATE TABLE prefix_data_comments (
+                              id SERIAL PRIMARY KEY,
+                              userid integer NOT NULL default '0',
+                              recordid integer NOT NULL default '0',
+                              content text NOT NULL default '',
+                              created integer NOT NULL default '0',
+                              modified integer NOT NULL default '0'
+                            );
+
+                            CREATE TABLE prefix_data_ratings (
+                              id SERIAL PRIMARY KEY,
+                              userid integer NOT NULL default '0',
+                              recordid integer NOT NULL default '0',
+                              rating integer NOT NULL default '0'
+                            );");
+                            
+    }
+    
     return true;
 }
 

diff --git a/mod/data/db/postgres7.sql b/mod/data/db/postgres7.sql
index 0993f8773325e3ed6ec7fdd88309ec09b43811d5..f670e597e6428c78442ba77ecddb86e98ade7640 100755 (executable)
--- a/mod/data/db/postgres7.sql
+++ b/mod/data/db/postgres7.sql
@@ -1,16 +1,19 @@
 
 CREATE TABLE prefix_data (
   id SERIAL PRIMARY KEY,
-  course int4 NOT NULL default '0',
+  course integer NOT NULL default '0',
   name varchar(255) NOT NULL default '',
   intro text NOT NULL default '',
-  ratings int4 NOT NULL default '0',
-  comments int NOT NULL default '0',
-  timedue int NOT NULL default '0',
-  timeavailable integer NOT NULL default '0',
+  ratings integer NOT NULL default '0',
+  comments integer NOT NULL default '0',
+  timeavailablefrom integer NOT NULL default '0',
+  timeavailableto integer NOT NULL default '0',
+  timeviewfrom integer NOT NULL default '0',
+  timeviewto integer NOT NULL default '0',
   participants integer NOT NULL default '0',
-  required integer NOT NULL default '0',
-  rsstype integer NOT NULL default '0',
+  requiredentries integer NOT NULL default '0',
+  requiredentriestoview integer NOT NULL default '0',
+  maxentries integer NOT NULL default '0',
   rssarticles integer NOT NULL default '0',
   singletemplate text NOT NULL default '',
   listtemplate text NOT NULL default '',
@@ -19,7 +22,7 @@ CREATE TABLE prefix_data (
   addtemplate text NOT NULL default '',
   rsstemplate text NOT NULL default '',
   csstemplate text NOT NULL default '',
-  approval int NOT NULL default '0',
+  approval integer NOT NULL default '0',
   scale integer NOT NULL default '0',
   assessed integer NOT NULL default '0',
   assesspublic integer NOT NULL default '0',
@@ -32,51 +35,50 @@ CREATE TABLE prefix_data (
 
 CREATE TABLE prefix_data_content (
   id SERIAL PRIMARY KEY,
-  fieldid int4 NOT NULL default '0',
-  recordid int4 NOT NULL default '0',
-  content text NOT NULL,
-  content1 text NOT NULL,
-  content2 text NOT NULL,
-  content3 text NOT NULL,
-  content4 text NOT NULL
+  fieldid integer NOT NULL default '0',
+  recordid integer NOT NULL default '0',
+  content text NOT NULL default '',
+  content1 text NOT NULL default '',
+  content2 text NOT NULL default '',
+  content3 text NOT NULL default '',
+  content4 text NOT NULL default ''
 );
 
 
 CREATE TABLE prefix_data_fields (
   id SERIAL PRIMARY KEY,
-  dataid int4 NOT NULL default '0',
+  dataid integer NOT NULL default '0',
   type varchar(255) NOT NULL default '',
   name varchar(255) NOT NULL default '',
-  description text,
-  param1  text,
-  param2  text,
-  param3  text,
-  param4  text,
-  param5  text,
-  param6  text,
-  param7  text,
-  param8  text,
-  param9  text,
-  param10 text
+  description text NOT NULL default '',
+  param1  text NOT NULL default '',
+  param2  text NOT NULL default '',
+  param3  text NOT NULL default '',
+  param4  text NOT NULL default '',
+  param5  text NOT NULL default '',
+  param6  text NOT NULL default '',
+  param7  text NOT NULL default '',
+  param8  text NOT NULL default '',
+  param9  text NOT NULL default '',
+  param10 text NOT NULL default ''
 );
 
-
 CREATE TABLE prefix_data_records (
   id SERIAL PRIMARY KEY,
-  userid int4 NOT NULL default '0',
-  groupid int4 NOT NULL default '0',
-  dataid int4 NOT NULL default '0',
-  timecreated int4 NOT NULL default '0',
-  timemodified int4 NOT NULL default '0',
-  approved int NOT NULL default '0'
+  userid integer NOT NULL default '0',
+  groupid integer NOT NULL default '0',
+  dataid integer NOT NULL default '0',
+  timecreated integer NOT NULL default '0',
+  timemodified integer NOT NULL default '0',
+  approved integer NOT NULL default '0'
 );
 
 
 CREATE TABLE prefix_data_comments (
   id SERIAL PRIMARY KEY,
-  userid int4 NOT NULL default '0',
-  recordid int4 NOT NULL default '0',
-  content text,
+  userid integer NOT NULL default '0',
+  recordid integer NOT NULL default '0',
+  content text NOT NULL default '',
   created integer NOT NULL default '0',
   modified integer NOT NULL default '0'
 );
@@ -84,9 +86,9 @@ CREATE TABLE prefix_data_comments (
 
 CREATE TABLE prefix_data_ratings (
   id SERIAL PRIMARY KEY,
-  userid int4 NOT NULL default '0',
-  recordid int4 NOT NULL default '0',
-  rating int4 NOT NULL default '0'
+  userid integer NOT NULL default '0',
+  recordid integer NOT NULL default '0',
+  rating integer NOT NULL default '0'
 );
 
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('data', 'view', 'data', 'name');

diff --git a/mod/data/version.php b/mod/data/version.php
index 7b981325ef810eaf58e808a14b8c8a85ce99739c..691882e4bca243c1838ac82e10ad5dea8616a0c1 100644 (file)
--- a/mod/data/version.php
+++ b/mod/data/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2006032900;
+$module->version  = 2006050500;
 $module->requires = 2005060230;  // Requires this Moodle version
 $module->cron     = 60;