Fixed issue #5939: Error by creating a new question

LimeSurvey · Mar 26, 2012 · f8850fb · f8850fb
1 parent 13d06a4
commit f8850fb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/application/helpers/update/upgrade-all_helper.php b/application/helpers/update/upgrade-all_helper.php
@@ -101,9 +101,6 @@ function db_upgrade_all($oldversion) {
         );
         Yii::app()->db->createCommand()->createTable('{{expression_errors}}',$fields);
     }
-
-    if ($oldversion < 155)
-        Yii::app()->db->createCommand()->addColumn('{{surveys_languagesettings}}', 'surveyls_attributecaptions', "text NOT NULL default ''");
 }
 
 function upgrade_question_attributes148()

diff --git a/installer/sql/create-mssql.sql b/installer/sql/create-mssql.sql
@@ -341,7 +341,7 @@ CREATE TABLE [prefix_surveys_languagesettings] (
   [surveyls_email_confirm_subj] VARCHAR(255) NULL,
   [surveyls_email_confirm] TEXT NULL,
   [surveyls_dateformat] INT NOT NULL DEFAULT 1,
-  [surveyls_attributecaptions] VARCHAR(255) NULL,
+  [surveyls_attributecaptions] TEXT NULL,
   [email_admin_notification_subj] VARCHAR(255) NULL,
   [email_admin_notification] TEXT NULL,
   [email_admin_responses_subj] VARCHAR(255) NULL,

diff --git a/installer/sql/create-pgsql.sql b/installer/sql/create-pgsql.sql
@@ -336,7 +336,7 @@ CREATE TABLE prefix_surveys_languagesettings (
     surveyls_email_confirm_subj character varying(255),
     surveyls_email_confirm text,
     surveyls_dateformat integer DEFAULT 1 NOT NULL,
-    surveyls_attributecaptions character varying(255) NULL,
+    surveyls_attributecaptions text,
     email_admin_notification_subj character varying(255),
     email_admin_notification text,
     email_admin_responses_subj character varying(255),