Fixed issue #6594: Error when upgrading from version 1.87

LimeSurvey · Sep 27, 2012 · 75cb491 · 75cb491
1 parent 0447b92
commit 75cb491
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -577,8 +577,8 @@ function db_upgrade_all($oldversion) {
         alterColumn('{{user_groups}}','name',"{$sVarchar}(20)",false);
         alterColumn('{{user_groups}}','description',"text",false);
 
-        Yii::app()->db->createCommand()->dropIndex('user_in_groups_idx1','{{user_in_groups}}');
-        addPrimaryKey('user_in_groups', array('ugid','uid'));
+        try { Yii::app()->db->createCommand()->dropIndex('user_in_groups_idx1','{{user_in_groups}}'); } catch(Exception $e) {}        
+        try { addPrimaryKey('user_in_groups', array('ugid','uid')); } catch(Exception $e) {}        
 
         addColumn('{{surveys_languagesettings}}','surveyls_numberformat',"integer NOT NULL DEFAULT 0");