Allow longer answers to support text fields better

diff --git a/mod/survey/db/mysql.php b/mod/survey/db/mysql.php
index 8d940bc2ec15c6584b0cd9639089d310337dda43..db34db91421c8ef96bd3db31f341f9cfd32362f1 100644 (file)
--- a/mod/survey/db/mysql.php
+++ b/mod/survey/db/mysql.php
@@ -167,6 +167,11 @@ function survey_upgrade($oldversion) {
         execute_sql("INSERT INTO `{$CFG->prefix}survey_questions` (`id`, `text`, `shorttext`, `multi`, `intro`, `type`, `options`) VALUES (73, 'ciq5', 'ciq5short', '', '', 0, '')");
     }
 
+    if ($oldversion < 2004021602) {
+        table_column("survey_answers", "answer1", "answer1", "text", "", "", "");
+        table_column("survey_answers", "answer2", "answer2", "text", "", "", "");
+    }
+
     return true;
 }
 

diff --git a/mod/survey/db/mysql.sql b/mod/survey/db/mysql.sql
index 6ae60272ca6d42e576ba481626571b781cf1e676..257c9b2e8af01ed6fa4ce3f754ecb4ed400db7ba 100755 (executable)
--- a/mod/survey/db/mysql.sql
+++ b/mod/survey/db/mysql.sql
@@ -68,8 +68,8 @@ CREATE TABLE prefix_survey_answers (
   survey int(10) unsigned NOT NULL default '0',\r
   question int(10) unsigned NOT NULL default '0',\r
   time int(10) unsigned default NULL,\r
-  answer1 char(255) default NULL,\r
-  answer2 char(255) default NULL,\r
+  answer1 text default NULL,\r
+  answer2 text default NULL,\r
   PRIMARY KEY  (id),\r
   UNIQUE KEY id (id)\r
 ) TYPE=MyISAM;\r

diff --git a/mod/survey/db/postgres7.php b/mod/survey/db/postgres7.php
index a9f302af0c84aabef914fcb788055f9659af3053..24f4f41a9f2b7a03876bbf2379c00f37529f081f 100644 (file)
--- a/mod/survey/db/postgres7.php
+++ b/mod/survey/db/postgres7.php
@@ -15,6 +15,11 @@ function survey_upgrade($oldversion) {
         modify_database("", "INSERT INTO `prefix_survey_questions` (`id`, `text`, `shorttext`, `multi`, `intro`, `type`, `options`) VALUES (73, 'ciq5', 'ciq5short', '', '', 0, '')");
     }
 
+    if ($oldversion < 2004021602) {
+        table_column("survey_answers", "answer1", "answer1", "text", "", "", "");
+        table_column("survey_answers", "answer2", "answer2", "text", "", "", "");
+    }
+
     return true;
 }
 

diff --git a/mod/survey/db/postgres7.sql b/mod/survey/db/postgres7.sql
index 5a1a860704624405c5faf2d22c60eafd92ec07cf..7af7bc5cb7411236b516f245d8a8dce3c7db6a8e 100755 (executable)
--- a/mod/survey/db/postgres7.sql
+++ b/mod/survey/db/postgres7.sql
@@ -65,8 +65,8 @@ CREATE TABLE prefix_survey_answers (
   survey integer NOT NULL default '0',
   question integer NOT NULL default '0',
   time integer default NULL,
-  answer1 char(255) default NULL,
-  answer2 char(255) default NULL
+  answer1 text default NULL,
+  answer2 text default NULL
 );
 
 #

diff --git a/mod/survey/version.php b/mod/survey/version.php
index 4686ffb0c922ef47dd80541bc9b62d66e962ae30..daa60c1cf16f0daf1c0c1704e7d703f6f7d119bd 100644 (file)
--- a/mod/survey/version.php
+++ b/mod/survey/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004021601;
+$module->version  = 2004021602;
 $module->requires = 2004013101;  // Requires this Moodle version
 $module->cron     = 0;