* change for upgrade.

This commit is contained in:
wangyidong
2016-03-08 16:27:47 +08:00
parent 4f7b7266f4
commit a04db8bc49
6 changed files with 9 additions and 4 deletions
+1 -1
View File
@@ -1 +1 @@
8.0.1
8.1.stable
+1 -1
View File
@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* Basic settings. */
$config = new config();
$config->version = '8.0.1'; // The version of zentaopms. Don't change it.
$config->version = '8.1'; // The version of zentaopms. Don't change it.
$config->charset = 'UTF-8'; // The charset of zentaopms.
$config->cookieLife = time() + 2592000; // The cookie life time.
$config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
+1 -1
View File
@@ -1,6 +1,6 @@
ALTER TABLE `zt_action` ADD INDEX `action` (`objectID`, `product`, `project`, `action`, `date`);
ALTER TABLE `zt_branch` ADD INDEX `branch` (`product`);
ALTER TABLE `zt_bug` ADD INDEX `bug` (`product`,`module`,`project`,`assignedTo`)
ALTER TABLE `zt_bug` ADD INDEX `bug` (`product`,`module`,`project`,`assignedTo`);
ALTER TABLE `zt_build` ADD INDEX `build` (`product`, `project`);
ALTER TABLE `zt_case` ADD INDEX `case` (`product`, `module`, `story`);
ALTER TABLE `zt_cron` ADD INDEX `cron` (`lastTime`);
+1
View File
@@ -97,3 +97,4 @@ $lang->upgrade->fromVersions['7_2_5'] = '7.2.5';
$lang->upgrade->fromVersions['7_3'] = '7.3';
$lang->upgrade->fromVersions['7_4_beta'] = '7.4.beta';
$lang->upgrade->fromVersions['8_0'] = '8.0';
$lang->upgrade->fromVersions['8_0_1'] = '8.0.1';
+1
View File
@@ -97,3 +97,4 @@ $lang->upgrade->fromVersions['7_2_5'] = '7.2.5';
$lang->upgrade->fromVersions['7_3'] = '7.3';
$lang->upgrade->fromVersions['7_4_beta'] = '7.4.beta';
$lang->upgrade->fromVersions['8_0'] = '8.0';
$lang->upgrade->fromVersions['8_0_1'] = '8.0.1';
+4 -1
View File
@@ -131,6 +131,8 @@ class upgradeModel extends model
case '7_4_beta':
$this->execSQL($this->getUpgradeFile('7.4.beta'));
case '8_0':
case '8_0_1':
$this->execSQL($this->getUpgradeFile('8.0.1'));
default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
}
@@ -203,6 +205,7 @@ class upgradeModel extends model
case '7_3': $confirmContent .= file_get_contents($this->getUpgradeFile('7.3'));
case '7_4_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('7.4.beta'));
case '8_0':
case '8_0_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.0.1'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
@@ -651,7 +654,7 @@ class upgradeModel extends model
public function execSQL($sqlFile)
{
$mysqlVersion = $this->loadModel('install')->getMysqlVersion();
$ignoreCode = '|1050|1060|1062|1091|1169|';
$ignoreCode = '|1050|1060|1062|1091|1169|1061|';
/* Read the sql file to lines, remove the comment lines, then join theme by ';'. */
$sqls = explode("\n", file_get_contents($sqlFile));