Dev: Add default value 0 to assessment_value

LimeSurvey · Jan 12, 2018 · 24cc871 · 24cc871
1 parent 9440abe
commit 24cc871
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -13,7 +13,7 @@
 
 
 $config['versionnumber'] = '3.0.2'; //The current version of this branch, LS3
-$config['dbversionnumber'] = 342;
+$config['dbversionnumber'] = 343;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['assetsversionnumber'] = '30003';

diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -936,6 +936,16 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
             $oTransaction->commit();
         }
 
+        /**
+         * Column assessment_value not null but default to 0.
+         */
+        if ($iOldDBVersion < 343) {
+            $oTransaction = $oDB->beginTransaction();
+            alterColumn('{{answers}}', 'assessment_value', 'integer', false, '0');
+            $oDB->createCommand()->update('{{settings_global}}', array('stg_value'=>343), "stg_name='DBVersion'");
+            $oTransaction->commit();
+        }
+
     } catch (Exception $e) {
         Yii::app()->setConfig('Updating', false);
         $oTransaction->rollback();

diff --git a/installer/create-database.php b/installer/create-database.php
@@ -30,7 +30,7 @@ function createDatabase($oDB){
             'code' => 'string(5) NOT NULL',
             'answer' => 'text NOT NULL',
             'sortorder' => 'integer NOT NULL',
-            'assessment_value' => 'integer NOT NULL',
+            'assessment_value' => 'integer NOT NULL DEFAULT 0',
             'language' => "string(20) NOT NULL DEFAULT 'en'",
             'scale_id' => 'integer NOT NULL DEFAULT 0',
         ));