force remaining NULL fields into NOT NULL '0'/''

diff --git a/mod/hotpot/db/postgres7.php b/mod/hotpot/db/postgres7.php
index 2b317566946a9513ccecfe3d4da574d0eb14edc4..d50172947c6ff4349a9349638a06bc637d64a316 100644 (file)
--- a/mod/hotpot/db/postgres7.php
+++ b/mod/hotpot/db/postgres7.php
@@ -32,6 +32,11 @@ function hotpot_upgrade($oldversion) {
                $ok = $ok && hotpot_get_update_to_v2();\r
                $ok = $ok && hotpot_update_to_v2_1_16();\r
        }\r
+       // update to HotPot v2.1.17\r
+       if ($oldversion < 2006042602) {\r
+               $ok = $ok && hotpot_get_update_to_v2();\r
+               $ok = $ok && hotpot_update_to_v2_1_17();\r
+       }\r
        return $ok;\r
 }\r
 function hotpot_get_update_to_v2() {\r

diff --git a/mod/hotpot/db/postgres7.sql b/mod/hotpot/db/postgres7.sql
index 1f6e0fbb8a5cce30abdc8877e13140a0dac36b31..fb36061c9270006008fd650cffe7ee8d6d5e89ad 100644 (file)
--- a/mod/hotpot/db/postgres7.sql
+++ b/mod/hotpot/db/postgres7.sql
@@ -37,15 +37,15 @@ CREATE TABLE prefix_hotpot_attempts (
     id  SERIAL PRIMARY KEY,
     hotpot        INT4 NOT NULL default '0',
     userid        INT4 NOT NULL default '0',
-    starttime     INT4,
-    endtime       INT4,
-    score         INT2,
-    penalties     INT2,
+    starttime     INT4 NOT NULL default '0',
+    endtime       INT4 NOT NULL default '0',
+    score         INT2 NOT NULL default '0',
+    penalties     INT2 NOT NULL default '0',
     attempt       INT2 NOT NULL default '0',
     timestart     INT4 NOT NULL default '0',
     timefinish    INT4 NOT NULL default '0',
     status        INT2 NOT NULL default '1',
-    clickreportid INT4 default NULL
+    clickreportid INT4 NOT NULL default '0'
 );
 COMMENT ON TABLE prefix_hotpot IS 'details about Hot Potatoes quiz attempts';
 
@@ -59,7 +59,7 @@ CREATE INDEX prefix_hotpot_attempts_userid_idx ON prefix_hotpot_attempts (userid
 CREATE TABLE prefix_hotpot_details (
     id  SERIAL PRIMARY KEY,
     attempt  INT4 NOT NULL default '0',
-    details  TEXT
+    details  TEXT NOT NULL default ''
 );
 COMMENT ON TABLE prefix_hotpot_details IS 'raw details (as XML) of Hot Potatoes quiz attempts';
 
@@ -71,9 +71,9 @@ CREATE INDEX prefix_hotpot_details_attempt_idx ON prefix_hotpot_details (attempt
 
 CREATE TABLE prefix_hotpot_questions (
     id  SERIAL PRIMARY KEY,
-    name   TEXT,
+    name   TEXT NOT NULL default '',
     type   INT2 NOT NULL default '0',
-    text   INT4 NULL,
+    text   INT4 NOT NULL default '0',
     hotpot INT4 NOT NULL default '0'
 );
 COMMENT ON TABLE prefix_hotpot_questions IS 'details about questions in Hot Potatoes quiz attempts';
@@ -89,14 +89,14 @@ CREATE TABLE prefix_hotpot_responses (
     id  SERIAL PRIMARY KEY,
     attempt   INT4 NOT NULL default '0',
     question  INT4 NOT NULL default '0',
-    score     INT2,
-    weighting INT2,
+    score     INT2 NOT NULL default '0',
+    weighting INT2 NOT NULL default '0',
     correct   VARCHAR(255) NOT NULL default '',
     wrong     VARCHAR(255) NOT NULL default '',
     ignored   VARCHAR(255) NOT NULL default '',
-    hints     INT2,
-    clues     INT2,
-    checks    INT2
+    hints     INT2 NOT NULL default '0',
+    clues     INT2 NOT NULL default '0',
+    checks    INT2 NOT NULL default '0'
 );
 COMMENT ON TABLE prefix_hotpot_responses IS 'details about responses in Hot Potatoes quiz attempts';
 
@@ -109,7 +109,7 @@ CREATE INDEX prefix_hotpot_responses_question_idx ON prefix_hotpot_responses (qu
 
 CREATE TABLE prefix_hotpot_strings (
   id  SERIAL PRIMARY KEY,
-  string TEXT NOT NULL
+  string TEXT NOT NULL default ''
 );
 COMMENT ON TABLE prefix_hotpot_strings IS 'strings used in Hot Potatoes questions and responses';
 

diff --git a/mod/hotpot/version.php b/mod/hotpot/version.php
index bb1814f2ace5acc7c623f0dc425ebd7d88080a7d..17d7ccffd572af8eeac5661e2d4fa2f4855240a0 100644 (file)
--- a/mod/hotpot/version.php
+++ b/mod/hotpot/version.php
@@ -3,8 +3,8 @@
 ///  Code fragment to define the version of hotpot
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
-$module->version  = 2006042601;  // release date of this version (see note below)
-$module->release  = 'v2.1.16';    // human-friendly version name (used in mod/hotpot/lib.php)
+$module->version  = 2006042602;  // release date of this version (see note below)
+$module->release  = 'v2.1.17';    // 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
 //     YYYY : year