From b5ab92af8921fff53ae265cea3cb6925fd20e545 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 17 May 2011 15:22:59 -0700
Subject: [PATCH] Upgrade from 2.2.5 to 2.2.6

---
 server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java    | 2 ++
 .../dao/{Upgrade224to225.java => Upgrade225to226.java}      | 6 +++---
 setup/db/db/{schema-224to225.sql => schema-225to226.sql}    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename server/src/com/cloud/upgrade/dao/{Upgrade224to225.java => Upgrade225to226.java} (93%)
 rename setup/db/db/{schema-224to225.sql => schema-225to226.sql} (97%)

diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
index 71549e51d41..5ddf96c8806 100644
--- a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -41,6 +41,7 @@ import com.cloud.upgrade.dao.Upgrade218to22;
 import com.cloud.upgrade.dao.Upgrade218to224DomainVlans;
 import com.cloud.upgrade.dao.Upgrade221to222;
 import com.cloud.upgrade.dao.Upgrade222to224;
+import com.cloud.upgrade.dao.Upgrade225to226;
 import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
 import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
 import com.cloud.upgrade.dao.VersionDao;
@@ -69,6 +70,7 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
         _upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224()});
         _upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224() });
         _upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224() });
+        _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226()});
     }
 
     protected void runScript(File file) {
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade224to225.java b/server/src/com/cloud/upgrade/dao/Upgrade225to226.java
similarity index 93%
rename from server/src/com/cloud/upgrade/dao/Upgrade224to225.java
rename to server/src/com/cloud/upgrade/dao/Upgrade225to226.java
index dc6e28f0032..b083d9a54de 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade224to225.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade225to226.java
@@ -23,16 +23,16 @@ import java.sql.Connection;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.Script;
 
-public class Upgrade224to225 implements DbUpgrade {
+public class Upgrade225to226 implements DbUpgrade {
 
     @Override
     public String[] getUpgradableVersionRange() {
-        return new String[] {"2.2.4"};
+        return new String[] {"2.2.5"};
     }
 
     @Override
     public String getUpgradedVersion() {
-        return "2.2.5";
+        return "2.2.6";
     }
 
     @Override
diff --git a/setup/db/db/schema-224to225.sql b/setup/db/db/schema-225to226.sql
similarity index 97%
rename from setup/db/db/schema-224to225.sql
rename to setup/db/db/schema-225to226.sql
index 8c7d3043371..98ecad0f4f9 100644
--- a/setup/db/db/schema-224to225.sql
+++ b/setup/db/db/schema-225to226.sql
@@ -1,5 +1,5 @@
 --;
--- Schema upgrade from 2.2.4 to 2.2.5;
+-- Schema upgrade from 2.2.5 to 2.2.6;
 --;
 
 ALTER TABLE `cloud`.`mshost` ADD COLUMN `runid` bigint NOT NULL DEFAULT 0 COMMENT 'run id, combined with msid to form a cluster session';