From 55b2126228de83355dcee318ca8410784b9328b7 Mon Sep 17 00:00:00 2001
From: gbateson <gbateson>
Date: Thu, 27 Apr 2006 21:22:43 +0000
Subject: [PATCH] force remaining NULL fields into NOT NULL '0'/''

---
 mod/hotpot/db/postgres7.php |  5 +++++
 mod/hotpot/db/postgres7.sql | 28 ++++++++++++++--------------
 mod/hotpot/version.php      |  4 ++--
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/mod/hotpot/db/postgres7.php b/mod/hotpot/db/postgres7.php
index 2b31756694..d50172947c 100644
--- 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();
 		$ok = $ok && hotpot_update_to_v2_1_16();
 	}
+	// update to HotPot v2.1.17
+	if ($oldversion < 2006042602) {
+		$ok = $ok && hotpot_get_update_to_v2();
+		$ok = $ok && hotpot_update_to_v2_1_17();
+	}
 	return $ok;
 }
 function hotpot_get_update_to_v2() {
diff --git a/mod/hotpot/db/postgres7.sql b/mod/hotpot/db/postgres7.sql
index 1f6e0fbb8a..fb36061c92 100644
--- 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 bb1814f2ac..17d7ccffd5 100644
--- 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
-- 
2.39.5