From 832d67f824a3e330fdc9d617d5e02ee3bcefdd8f Mon Sep 17 00:00:00 2001 From: R4SAS Date: Wed, 25 Apr 2018 10:10:17 +0000 Subject: [PATCH] bump DB version, update db upgrade script --- include/version.inc.php | 2 +- upgrade/definitions/1.0.2_to_1.0.3.inc.php | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/version.inc.php b/include/version.inc.php index b0cc6d0ed..d95474b42 100644 --- a/include/version.inc.php +++ b/include/version.inc.php @@ -2,7 +2,7 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; define('MPOS_VERSION', '1.0.9'); -define('DB_VERSION', '1.0.2'); +define('DB_VERSION', '1.0.3'); define('CONFIG_VERSION', '1.0.1'); define('HASH_VERSION', 1); diff --git a/upgrade/definitions/1.0.2_to_1.0.3.inc.php b/upgrade/definitions/1.0.2_to_1.0.3.inc.php index 0a9cd750b..fddd7a35a 100644 --- a/upgrade/definitions/1.0.2_to_1.0.3.inc.php +++ b/upgrade/definitions/1.0.2_to_1.0.3.inc.php @@ -9,13 +9,9 @@ function run_103() { $db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed // Upgrade specific variables - $aSql[] = " - ALTER TABLE `statistics_shares` - CHANGE `valid` `valid` BIGINT(20) NOT NULL DEFAULT '0', - CHANGE `invalid` `invalid` BIGINT(20) NOT NULL DEFAULT '0', - CHANGE `pplns_valid` `pplns_valid` BIGINT(20) NOT NULL DEFAULT '0', - CHANGE `pplns_invalid` `pplns_invalid` BIGINT(20) NOT NULL DEFAULT '0'; - "; + $aSql[] = "UPDATE `statistics_shares` SET `valid` = '0' WHERE `valid` IS NULL;"; + $aSql[] = "UPDATE `statistics_shares` SET `pplns_valid` = '0' WHERE `pplns_valid` IS NULL;"; + $aSql[] = "ALTER TABLE `statistics_shares` CHANGE `valid` `valid` BIGINT(20) NOT NULL DEFAULT '0', CHANGE `pplns_valid` `pplns_valid` BIGINT(20) NOT NULL DEFAULT '0';"; $aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '" . $db_version_new . "' WHERE name = 'DB_VERSION';"; if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {