From 24cc8717d11bf9b6c79d4ef4e922df277e691a11 Mon Sep 17 00:00:00 2001 From: Olle Haerstedt Date: Fri, 12 Jan 2018 15:45:42 +0100 Subject: [PATCH] Dev: Add default value 0 to assessment_value --- application/config/version.php | 2 +- application/helpers/update/updatedb_helper.php | 10 ++++++++++ installer/create-database.php | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/application/config/version.php b/application/config/version.php index 719049e352d..51e15156477 100644 --- 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 index f9896f1c082..4628602c622 100644 --- 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 index 00d62f8e8f3..2ec89e5eae6 100755 --- 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', ));