From a3b306b8ef5942e3430c4294c5e9119ab7a08ebd Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Sat, 1 May 2010 08:02:48 +0000
Subject: [PATCH]  + upgrade to 1.0stable.

---
 trunk/module/upgrade/model.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/trunk/module/upgrade/model.php b/trunk/module/upgrade/model.php
index fe869ccb4e..d573b95501 100644
--- a/trunk/module/upgrade/model.php
+++ b/trunk/module/upgrade/model.php
@@ -38,6 +38,7 @@ class upgradeModel extends model
             $this->upgradeFrom0_6To1_0_B();
             $this->upgradeFrom1_0betaTo1_0rc1();
             $this->upgradeFrom1_0rc1To1_0rc2();
+            $this->upgradeFrom1_0rc2To1_0stable();
         }
         elseif($fromVersion == '0_4beta')
         {
@@ -46,6 +47,7 @@ class upgradeModel extends model
             $this->upgradeFrom0_6To1_0_B();
             $this->upgradeFrom1_0betaTo1_0rc1();
             $this->upgradeFrom1_0rc1To1_0rc2();
+            $this->upgradeFrom1_0rc2To1_0stable();
         }
         elseif($fromVersion == '0_5beta')
         {
@@ -53,21 +55,25 @@ class upgradeModel extends model
             $this->upgradeFrom0_6To1_0_B();
             $this->upgradeFrom1_0betaTo1_0rc1();
             $this->upgradeFrom1_0rc1To1_0rc2();
+            $this->upgradeFrom1_0rc2To1_0stable();
         }
         elseif($fromVersion == '0_6beta')
         {
             $this->upgradeFrom0_6To1_0_B();
             $this->upgradeFrom1_0betaTo1_0rc1();
             $this->upgradeFrom1_0rc1To1_0rc2();
+            $this->upgradeFrom1_0rc2To1_0stable();
         }
         elseif($fromVersion == '1_0beta')
         {
             $this->upgradeFrom1_0betaTo1_0rc1();
             $this->upgradeFrom1_0rc1To1_0rc2();
+            $this->upgradeFrom1_0rc2To1_0stable();
         }
         elseif($fromVersion == '1_0rc1')
         {
             $this->upgradeFrom1_0rc1To1_0rc2();
+            $this->upgradeFrom1_0rc2To1_0stable();
         }
     }
 
@@ -162,6 +168,12 @@ class upgradeModel extends model
         if(!$this->isError()) $this->updateVersion('1.0rc2');
     }
 
+    /* 从1.0rc2版本升级到1.0stable版本。*/
+    private function upgradeFrom1_0rc1To1_0rc2()
+    {
+        $this->updateVersion('1.0rc2');
+    }
+
     /* 更新每个表的company字段。*/
     private function updateCompany()
     {