fix bug 5304

diff --git a/mod/hotpot/db/mysql.php b/mod/hotpot/db/mysql.php
index 95ba4cfd0a0ac362f91e01130ef747405e29ea80..17ceb3b197b3ac5989fd01f64d33b281e945d7df 100644 (file)
--- a/mod/hotpot/db/mysql.php
+++ b/mod/hotpot/db/mysql.php
@@ -22,7 +22,7 @@ function hotpot_upgrade($oldversion) {
                $ok = $ok && hotpot_update_to_v2_1_2();\r
        }\r
        // update to HotPot v2.1.16\r
-       if ($oldversion < 2006042102) {\r
+       if ($oldversion < 2006042103) {\r
                $ok = $ok && hotpot_get_update_to_v2();\r
                $ok = $ok && hotpot_update_to_v2_1_16();\r
        }\r

diff --git a/mod/hotpot/db/postgres7.php b/mod/hotpot/db/postgres7.php
index dfad962729ae7f372c86751ffc2cc0d96fb5bb7f..2b317566946a9513ccecfe3d4da574d0eb14edc4 100644 (file)
--- a/mod/hotpot/db/postgres7.php
+++ b/mod/hotpot/db/postgres7.php
@@ -28,7 +28,7 @@ function hotpot_upgrade($oldversion) {
                $ok = $ok && hotpot_update_to_v2_1_8();\r
        }\r
        // update to HotPot v2.1.16\r
-       if ($oldversion < 2006042102) {\r
+       if ($oldversion < 2006042103) {\r
                $ok = $ok && hotpot_get_update_to_v2();\r
                $ok = $ok && hotpot_update_to_v2_1_16();\r
        }\r

diff --git a/mod/hotpot/db/update_to_v2.php b/mod/hotpot/db/update_to_v2.php
index 385fdf1e48f4343c12f32b3cffa1f42bddbd5d0f..a5ed613c00f79ddaac3dadfea8ca26ed5e72e3fd 100644 (file)
--- a/mod/hotpot/db/update_to_v2.php
+++ b/mod/hotpot/db/update_to_v2.php
@@ -3,8 +3,21 @@ function hotpot_update_to_v2_1_16() {
        global $CFG;\r
        $ok = true;\r
 \r
+       // settings for the "hotpot_questions_name_idx" index\r
+       $length = 20;\r
+       $field = 'name';\r
+       $table = 'hotpot_questions';\r
+       $index = '{$table}_{$name}_idx';\r
+\r
+       // remove the index\r
+       hotpot_db_delete_index("{$CFG->prefix}$table", $index);\r
+       hotpot_db_delete_index("{$CFG->prefix}$table", "{$CFG->prefix}$index");\r
+\r
        // make sure type of 'name' is a text field (not varchar 255)\r
-       $ok = $ok && hotpot_db_update_field_type('hotpot_questions', 'name', 'name', 'TEXT',   '',  '', 'NOT NULL', '');\r
+       $ok = $ok && hotpot_db_update_field_type($table, $field, $field, 'TEXT',   '',  '', 'NOT NULL', '');\r
+\r
+       // restore the index\r
+       $ok = $ok && hotpot_db_add_index($table, $field, $length);\r
 \r
        if (strtolower($CFG->dbtype)=='mysql') {\r
 \r
@@ -26,7 +39,7 @@ function hotpot_update_to_v2_1_16() {
                $ok = $ok && hotpot_index_remove_prefix('hotpot_attempts', 'userid');\r
                $ok = $ok && hotpot_index_remove_prefix('hotpot_details', 'attempt');\r
                $ok = $ok && hotpot_index_remove_prefix('hotpot_questions', 'hotpot');\r
-               $ok = $ok && hotpot_index_remove_prefix('hotpot_questions', 'name', 20);\r
+               //$ok = $ok && hotpot_index_remove_prefix('hotpot_questions', 'name', 20);\r
                $ok = $ok && hotpot_index_remove_prefix('hotpot_responses', 'attempt');\r
                $ok = $ok && hotpot_index_remove_prefix('hotpot_responses', 'question');\r
                $ok = $ok && hotpot_index_remove_prefix('hotpot_strings', 'string', 20);\r

diff --git a/mod/hotpot/version.php b/mod/hotpot/version.php
index 1e397345cb6b7c2f0a6ec1dad988113a423e486e..87e28204bcf41e8c714b85a308b3580e0ee15ca6 100644 (file)
--- 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  = 2006042102;  // release date of this version (see note below)
+$module->version  = 2006042103;  // 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