From dc9107f96629f6532eb9b23c2efba4a4efe1a41c Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Sat, 17 Apr 2010 06:44:33 +0000 Subject: [PATCH] * adjust the upgrade module. --- module/upgrade/control.php | 20 ++--------- module/upgrade/lang/zh-cn.php | 9 ++--- module/upgrade/model.php | 64 ++++++++++++++++++++++++++++------- 3 files changed, 58 insertions(+), 35 deletions(-) diff --git a/module/upgrade/control.php b/module/upgrade/control.php index d7913a8d59..3f90b20ea4 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -32,9 +32,8 @@ class upgrade extends control /* 选择系统。*/ public function selectVersion() { - /* 处理版本号。*/ - $version = substr($this->config->installedVersion, 0, strpos($this->config->installedVersion, ' ')); - $version = str_replace('.', '_', $version); + $version = str_replace(array(' ', '.'), array('', '_'), $this->config->installedVersion); + $version = strtolower($version); $this->view->header->title = $this->lang->upgrade->common . $this->lang->colon . $this->lang->upgrade->selectVersion; $this->view->position[] = $this->lang->upgrade->common; $this->view->version = $version; @@ -71,19 +70,4 @@ class upgrade extends control } $this->display(); } - - /* 更新每个表的company字段。*/ - public function updateCompany() - { - $constants = get_defined_constants(true); - $userConstants = $constants['user']; - - /* 查找每个表的id字段的最大值。*/ - foreach($userConstants as $key => $value) - { - if(strpos($key, 'TABLE') === false) continue; - if($key == 'TABLE_COMPANY' or $key == 'TABLE_CONFIG') continue; - $this->dbh->query("UPDATE $value SET company = '{$this->app->company->id}'"); - } - } } diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 2831784692..38deeed831 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -43,7 +43,8 @@ $lang->upgrade->toVersion = '升级到'; $lang->upgrade->confirm = '确认要执行的SQL语句'; $lang->upgrade->sureExecute = '确认执行'; -$lang->upgrade->fromVersions['0_3'] = '0.3 BETA'; -$lang->upgrade->fromVersions['0_4'] = '0.4 BETA'; -$lang->upgrade->fromVersions['0_5'] = '0.5 BETA'; -$lang->upgrade->fromVersions['0_6'] = '0.6 BETA'; +$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; +$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; +$lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; +$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; +$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index d6878def59..90748c05e1 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -30,27 +30,35 @@ class upgradeModel extends model /* 统一的升级入口，根据升级版本的不同，调用不同的升级步骤程序。*/ public function execute($fromVersion) { - if($fromVersion == '0_3') + if($fromVersion == '0_3beta') { $this->upgradeFrom0_3To0_4(); $this->upgradeFrom0_4To0_5(); $this->upgradeFrom0_5To0_6(); $this->upgradeFrom0_6To1_0_B(); + $this->upgradeFrom1_0betaTo1_0rc1(); } - elseif($fromVersion == '0_4') + elseif($fromVersion == '0_4beta') { $this->upgradeFrom0_4To0_5(); $this->upgradeFrom0_5To0_6(); $this->upgradeFrom0_6To1_0_B(); + $this->upgradeFrom1_0betaTo1_0rc1(); } - elseif($fromVersion == '0_5') + elseif($fromVersion == '0_5beta') { $this->upgradeFrom0_5To0_6(); $this->upgradeFrom0_6To1_0_B(); + $this->upgradeFrom1_0betaTo1_0rc1(); } - elseif($fromVersion == '0_6') + elseif($fromVersion == '0_6beta') { $this->upgradeFrom0_6To1_0_B(); + $this->upgradeFrom1_0betaTo1_0rc1(); + } + elseif($fromVersion == '1_0beta') + { + $this->upgradeFrom1_0betaTo1_0rc1(); } } @@ -58,27 +66,35 @@ class upgradeModel extends model public function confirm($fromVersion) { $confirmContent = ''; - if($fromVersion == '0_3') + if($fromVersion == '0_3beta') { $confirmContent .= file_get_contents($this->getUpgradeFile('0.3')); $confirmContent .= file_get_contents($this->getUpgradeFile('0.4')); $confirmContent .= file_get_contents($this->getUpgradeFile('0.5')); $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); } - elseif($fromVersion == '0_4') + elseif($fromVersion == '0_4beta') { $confirmContent .= file_get_contents($this->getUpgradeFile('0.4')); $confirmContent .= file_get_contents($this->getUpgradeFile('0.5')); $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); } - elseif($fromVersion == '0_5') + elseif($fromVersion == '0_5beta') { $confirmContent .= file_get_contents($this->getUpgradeFile('0.5')); $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); } - elseif($fromVersion == '0_6') + elseif($fromVersion == '0_6beta') { $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); + } + elseif($fromVersion == '1_0beta') + { + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); @@ -113,6 +129,29 @@ class upgradeModel extends model if(!$this->isError()) $this->updateVersion('1.0beta'); } + /* 从1.0beta版本升级到1.0rc1版本。*/ + private function upgradeFrom1_0betaTo1_0rc1() + { + $this->execSQL($this->getUpgradeFile('1.0.beta')); + $this->updateCompany(); + if(!$this->isError()) $this->updateVersion('1.0rc1'); + } + + /* 更新每个表的company字段。*/ + private function updateCompany() + { + $constants = get_defined_constants(true); + $userConstants = $constants['user']; + + /* 查找每个表的id字段的最大值。*/ + foreach($userConstants as $key => $value) + { + if(strpos($key, 'TABLE') === false) continue; + if($key == 'TABLE_COMPANY' or $key == 'TABLE_CONFIG') continue; + $this->dbh->query("UPDATE $value SET company = '{$this->app->company->id}'"); + } + } + /* 更新PMS的版本设置。*/ public function updateVersion($version) { @@ -122,20 +161,19 @@ class upgradeModel extends model $item->key = 'version'; $item->value = $version; - $stmt = $this->dao->select('id')->from(TABLE_CONFIG) + $configID = $this->dao->select('id')->from(TABLE_CONFIG) ->where('company')->eq(0) ->andWhere('owner')->eq('system') ->andWhere('section')->eq('global') ->andWhere('`key`')->eq('version') - ->query($autoCompany = false); - $configID = $stmt->fetchColumn('id'); + ->fetch('id', $autoComapny = false); if($configID > 0) { - $this->dao->update(TABLE_CONFIG)->data($item)->where('id')->eq($configID)->exec(); + $this->dao->update(TABLE_CONFIG)->data($item)->where('id')->eq($configID)->exec($autoCompany = false); } else { - $this->dao->insert(TABLE_CONFIG)->data($item)->exec(); + $this->dao->insert(TABLE_CONFIG)->data($item)->exec($autoCompany = false); } }