From 8723727de1f3cf80d73ca90b0ea8f4eae3d71d28 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Fri, 18 Mar 2011 10:41:58 -0700
Subject: [PATCH] added 2.2.2 to 2.2.4

---
 .../src/com/cloud/upgrade/dao/Upgrade217to22.java  | 14 ++++++--------
 setup/db/schema-21to22.sql                         |  2 +-
 setup/db/schema-snapshot-217to223.sql              |  7 ++++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/server/src/com/cloud/upgrade/dao/Upgrade217to22.java b/server/src/com/cloud/upgrade/dao/Upgrade217to22.java
index 0214ef2175d..3f276e76c7d 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade217to22.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade217to22.java
@@ -1072,14 +1072,12 @@ public class Upgrade217to22 implements DbUpgrade {
 
     @Override
     public File[] getCleanupScripts() {
-        return null;
+        String file = Script.findScript("", "db/schema-21to22-cleanup.sql");
+        if (file == null) {
+            throw new CloudRuntimeException("Unable to find the upgrade script, schema-21to22-cleanup.sql");
+        }
         
-//        String file = Script.findScript("", "db/schema-21to22-cleanup.sql");
-//        if (file == null) {
-//            throw new CloudRuntimeException("Unable to find the upgrade script, schema-21to22-cleanup.sql");
-//        }
-//        
-//        return new File[] { new File(file) };
+        return new File[] { new File(file) };
     }
 
     @Override
@@ -1089,7 +1087,7 @@ public class Upgrade217to22 implements DbUpgrade {
 
     @Override
     public String getUpgradedVersion() {
-        return "2.2.0";
+        return "2.2.1";
     }
     
     @Override
diff --git a/setup/db/schema-21to22.sql b/setup/db/schema-21to22.sql
index f6acaa0ee1d..4e633c4b1c8 100755
--- a/setup/db/schema-21to22.sql
+++ b/setup/db/schema-21to22.sql
@@ -548,4 +548,4 @@ CREATE TABLE `cloud`.`storage_pool_work` (
 
 -- Insert stuff?;
 INSERT INTO `cloud`.`sequence` (name, value) VALUES ('volume_seq', (SELECT max(id) + 1 or 200 from volumes));
-INSERT INTO `cloud`.`sequence` (name, value) VALUES ('networks_seq', 200);
+INSERT INTO `cloud`.`sequence` (name, value) VALUES ('networks_seq', 200);
\ No newline at end of file
diff --git a/setup/db/schema-snapshot-217to223.sql b/setup/db/schema-snapshot-217to223.sql
index 4255c131e83..d0bed4503d5 100644
--- a/setup/db/schema-snapshot-217to223.sql
+++ b/setup/db/schema-snapshot-217to223.sql
@@ -5,7 +5,8 @@ ALTER table snapshots add column `size` bigint unsigned NOT NULL;
 ALTER table snapshots add column `version` varchar(32) DEFAULT '2.1';
 ALTER table snapshots add column `hypervisor_type` varchar(32) DEFAULT 'XenServer';
 
-UPDATE snapshots s, volumes v SET s.data_center_id=v.data_center_id, s.domain_id=v.domain_id, s.disk_offering_id=v.disk_offering_id, s.size=v.size WHERE s.volume_id = v.id
-UPDATE snapshots s, snapshot_policy sp, snapshot_policy_ref spr SET s.type=snapshot_type=sp.interval+3. WHERE s.id=spr.snap_id and spr.policy_id=sr.id
+UPDATE snapshots s, volumes v SET s.data_center_id=v.data_center_id, s.domain_id=v.domain_id, s.disk_offering_id=v.disk_offering_id, s.size=v.size WHERE s.volume_id = v.id;
+UPDATE snapshots s, snapshot_policy sp, snapshot_policy_ref spr SET s.hypervisor_type=sp.interval+3 WHERE s.id=spr.snap_id and spr.policy_id=sp.id;
 
-DROP table snapshot_policy_ref
+DROP table snapshot_policy_ref;
+DELETE FROM snapshot_policy WHERE id=1;
\ No newline at end of file