Peter M. Groen / knowledgetree

Commit 7c81179b577da9ac8aa10668df028aead94ecfc3

Authored by kevin_fourie
1 parent 1e116abe

KTS-1712 

"Upgrade installer refers to wrong system setting property and knowledgetree version not updated in database"
Fixed.

Reviewed by: Kevin Fourie


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6315 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 14 additions and 7 deletions
docs/VERSION.txt
  View file @7c81179
1 -3.3.1 1 +3.3.0.2
lib/upgrades/UpgradeItems.inc.php
  View file @7c81179
@@ -394,8 +394,17 @@ class RecordUpgradeItem extends UpgradeItem { @@ -394,8 +394,17 @@ class RecordUpgradeItem extends UpgradeItem {
394 KTPermissionUtil::rebuildPermissionLookups(true); 394 KTPermissionUtil::rebuildPermissionLookups(true);
395 $po->end(); 395 $po->end();
396 396
  397 + $versionFile=KT_DIR . '/docs/VERSION-NAME.txt';
  398 + $fp = fopen($versionFile,'rt');
  399 + $systemVersion = fread($fp, filesize($versionFile));
  400 + fclose($fp);
  401 +
  402 + $query = "UPDATE system_settings SET value = ? WHERE name = ?";
  403 + $aParams = array($systemVersion, "knowledgetreeVersion");
  404 + DBUtil::runQuery(array($query, $aParams));
  405 +
397 $query = "UPDATE system_settings SET value = ? WHERE name = ?"; 406 $query = "UPDATE system_settings SET value = ? WHERE name = ?";
398 - $aParams = array($this->version, "knowledgeTreeVersion"); 407 + $aParams = array($this->version, "databaseVersion");
399 return DBUtil::runQuery(array($query, $aParams)); 408 return DBUtil::runQuery(array($query, $aParams));
400 } 409 }
401 410
setup/upgrade.php
  View file @7c81179
@@ -31,7 +31,7 @@ require_once(KT_LIB_DIR . '/upgrades/upgrade.inc.php'); @@ -31,7 +31,7 @@ require_once(KT_LIB_DIR . '/upgrades/upgrade.inc.php');
31 31
32 function generateUpgradeTable () { 32 function generateUpgradeTable () {
33 global $default; 33 global $default;
34 - $query = sprintf('SELECT value FROM %s WHERE name = "knowledgeTreeVersion"', $default->system_settings_table); 34 + $query = sprintf('SELECT value FROM %s WHERE name = "databaseVersion"', $default->system_settings_table);
35 $lastVersion = DBUtil::getOneResultKey($query, 'value'); 35 $lastVersion = DBUtil::getOneResultKey($query, 'value');
36 $currentVersion = $default->systemVersion; 36 $currentVersion = $default->systemVersion;
37 37
@@ -70,7 +70,7 @@ $GLOBALS['row'] = 1; @@ -70,7 +70,7 @@ $GLOBALS['row'] = 1;
70 70
71 function performAllUpgrades () { 71 function performAllUpgrades () {
72 global $default; 72 global $default;
73 - $query = sprintf('SELECT value FROM %s WHERE name = "knowledgeTreeVersion"', $default->system_settings_table); 73 + $query = sprintf('SELECT value FROM %s WHERE name = "databaseVersion"', $default->system_settings_table);
74 $lastVersion = DBUtil::getOneResultKey($query, 'value'); 74 $lastVersion = DBUtil::getOneResultKey($query, 'value');
75 $currentVersion = $default->systemVersion; 75 $currentVersion = $default->systemVersion;
76 76
sql/mysql/install/data.sql
  View file @7c81179
@@ -908,9 +908,7 @@ INSERT INTO `upgrades` VALUES (126, 'sql*3.1.6.6*0*3.1.6.6/copy_transaction.sql' @@ -908,9 +908,7 @@ INSERT INTO `upgrades` VALUES (126, 'sql*3.1.6.6*0*3.1.6.6/copy_transaction.sql'
908 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'); 908 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');
909 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'); 909 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');
910 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'); 910 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');
911 -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');  
912 -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');  
913 -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'); 911 +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');
914 912
915 -- 913 --
916 -- Dumping data for table `user_history` 914 -- Dumping data for table `user_history`