From 7c81179b577da9ac8aa10668df028aead94ecfc3 Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Tue, 20 Feb 2007 15:28:17 +0000 Subject: [PATCH] KTS-1712 "Upgrade installer refers to wrong system setting property and knowledgetree version not updated in database" Fixed. --- docs/VERSION.txt | 2 +- lib/upgrades/UpgradeItems.inc.php | 11 ++++++++++- setup/upgrade.php | 4 ++-- sql/mysql/install/data.sql | 4 +--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docs/VERSION.txt b/docs/VERSION.txt index bea438e..e7589ee 100644 --- a/docs/VERSION.txt +++ b/docs/VERSION.txt @@ -1 +1 @@ -3.3.1 +3.3.0.2 diff --git a/lib/upgrades/UpgradeItems.inc.php b/lib/upgrades/UpgradeItems.inc.php index b15af62..883f75f 100644 --- a/lib/upgrades/UpgradeItems.inc.php +++ b/lib/upgrades/UpgradeItems.inc.php @@ -394,8 +394,17 @@ class RecordUpgradeItem extends UpgradeItem { KTPermissionUtil::rebuildPermissionLookups(true); $po->end(); + $versionFile=KT_DIR . '/docs/VERSION-NAME.txt'; + $fp = fopen($versionFile,'rt'); + $systemVersion = fread($fp, filesize($versionFile)); + fclose($fp); + + $query = "UPDATE system_settings SET value = ? WHERE name = ?"; + $aParams = array($systemVersion, "knowledgetreeVersion"); + DBUtil::runQuery(array($query, $aParams)); + $query = "UPDATE system_settings SET value = ? WHERE name = ?"; - $aParams = array($this->version, "knowledgeTreeVersion"); + $aParams = array($this->version, "databaseVersion"); return DBUtil::runQuery(array($query, $aParams)); } diff --git a/setup/upgrade.php b/setup/upgrade.php index 8d7a0fb..8556cc5 100644 --- a/setup/upgrade.php +++ b/setup/upgrade.php @@ -31,7 +31,7 @@ require_once(KT_LIB_DIR . '/upgrades/upgrade.inc.php'); function generateUpgradeTable () { global $default; - $query = sprintf('SELECT value FROM %s WHERE name = "knowledgeTreeVersion"', $default->system_settings_table); + $query = sprintf('SELECT value FROM %s WHERE name = "databaseVersion"', $default->system_settings_table); $lastVersion = DBUtil::getOneResultKey($query, 'value'); $currentVersion = $default->systemVersion; @@ -70,7 +70,7 @@ $GLOBALS['row'] = 1; function performAllUpgrades () { global $default; - $query = sprintf('SELECT value FROM %s WHERE name = "knowledgeTreeVersion"', $default->system_settings_table); + $query = sprintf('SELECT value FROM %s WHERE name = "databaseVersion"', $default->system_settings_table); $lastVersion = DBUtil::getOneResultKey($query, 'value'); $currentVersion = $default->systemVersion; diff --git a/sql/mysql/install/data.sql b/sql/mysql/install/data.sql index 94dca09..62c67ce 100644 --- a/sql/mysql/install/data.sql +++ b/sql/mysql/install/data.sql @@ -908,9 +908,7 @@ INSERT INTO `upgrades` VALUES (126, 'sql*3.1.6.6*0*3.1.6.6/copy_transaction.sql' INSERT INTO `upgrades` VALUES (127, 'sql*3.1.6.7*0*3.1.6.7/sane-names-for-stuff.sql', 'Database upgrade to version 3.1.6.7: Sane-names-for-stuff', '2006-10-17 12:09:46', 1, 'upgrade*3.1.6.7*99*upgrade3.1.6.7'); INSERT INTO `upgrades` VALUES (128, 'upgrade*3.1.6.7*99*upgrade3.1.6.7', 'Upgrade from version 3.1.2 to 3.1.6.7', '2006-10-17 12:09:46', 1, 'upgrade*3.1.6.7*99*upgrade3.1.6.7'); INSERT INTO `upgrades` VALUES (129, 'upgrade*3.3.0.1*99*upgrade3.3.0.1', 'Upgrade from version 3.1.6.7 to 3.3.0.1', '2006-10-30 12:49:33', 1, 'upgrade*3.3.0.1*99*upgrade3.3.0.1'); -INSERT INTO `upgrades` VALUES (130, 'sql*3.3.0.1*0*3.3.0.1/system-settings-to-text.sql', 'Database upgrade to version 3.3.0.1: System-settings-to-text', '2007-01-28 23:49:52', 1, 'upgrade*3.3.1*99*upgrade3.3.1'); -INSERT INTO `upgrades` VALUES (131, 'sql*3.3.1*0*3.3.1/rss.sql', 'Database upgrade to version 3.3.1: Rss', '2007-01-28 23:49:52', 1, 'upgrade*3.3.1*99*upgrade3.3.1'); -INSERT INTO `upgrades` VALUES (132, 'upgrade*3.3.1*99*upgrade3.3.1', 'Upgrade from version 3.3.0.1 to 3.3.1', '2007-01-28 23:49:52', 1, 'upgrade*3.3.1*99*upgrade3.3.1'); +INSERT INTO `upgrades` VALUES (130, 'sql*3.3.0.1*0*3.3.0.1/system-settings-to-text.sql', 'Database upgrade to version 3.3.0.1: System-settings-to-text', '2007-01-28 23:49:52', 1, 'upgrade*3.3.0.1*99*upgrade3.3.0.1'); -- -- Dumping data for table `user_history` -- libgit2 0.21.4