4.4.2 upgrade schema

DaanHoogland · DaanHoogland · commit a52fd08a142e · 2014-11-24T15:08:49.000+01:00
remove 441to450 ddl (cherry picked from commit 5578616) (cherry picked from commit f18d623) Conflicts: engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java schema: Add upgrade paths from 4.3.2 to 4.4.0 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> (cherry picked from commit 73c6283)
diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade441to442.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade441to442.java
@@ -0,0 +1,64 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.upgrade.dao;
+
+import java.io.File;
+import java.sql.Connection;
+
+import org.apache.log4j.Logger;
+
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+
+public class Upgrade441to442 implements DbUpgrade {
+    final static Logger s_logger = Logger.getLogger(Upgrade441to442.class);
+
+    @Override
+    public String[] getUpgradableVersionRange() {
+        return new String[] {"4.4.1", "4.4.2"};
+    }
+
+    @Override
+    public String getUpgradedVersion() {
+        return "4.4.2";
+    }
+
+    @Override
+    public boolean supportsRollingUpgrade() {
+        return false;
+    }
+
+    @Override
+    public File[] getPrepareScripts() {
+        String script = Script.findScript("", "db/schema-441to442.sql");
+        if (script == null) {
+            throw new CloudRuntimeException("Unable to find db/schema-441to442.sql");
+        }
+
+        return new File[] {new File(script)};
+    }
+
+    @Override
+    public void performDataMigration(Connection conn) {
+    }
+
+    @Override
+    public File[] getCleanupScripts() {
+        return null;
+    }
+}
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
@@ -35,12 +35,12 @@
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.Script;
 
-public class Upgrade441to450 implements DbUpgrade {
-    final static Logger s_logger = Logger.getLogger(Upgrade441to450.class);
+public class Upgrade442to450 implements DbUpgrade {
+    final static Logger s_logger = Logger.getLogger(Upgrade442to450.class);
 
     @Override
     public String[] getUpgradableVersionRange() {
-        return new String[] {"4.4.1", "4.5.0"};
+        return new String[] {"4.4.2", "4.5.0"};
     }
 
     @Override
@@ -55,9 +55,9 @@ public boolean supportsRollingUpgrade() {
 
     @Override
     public File[] getPrepareScripts() {
-        String script = Script.findScript("", "db/schema-441to450.sql");
+        String script = Script.findScript("", "db/schema-442to450.sql");
         if (script == null) {
-            throw new CloudRuntimeException("Unable to find db/schema-441to450.sql");
+            throw new CloudRuntimeException("Unable to find db/schema-442to450.sql");
         }
 
         return new File[] {new File(script)};
@@ -73,9 +73,9 @@ public void performDataMigration(Connection conn) {
 
     @Override
     public File[] getCleanupScripts() {
-        String script = Script.findScript("", "db/schema-441to450-cleanup.sql");
+        String script = Script.findScript("", "db/schema-442to450-cleanup.sql");
         if (script == null) {
-            throw new CloudRuntimeException("Unable to find db/schema-441to450-cleanup.sql");
+            throw new CloudRuntimeException("Unable to find db/schema-442to450-cleanup.sql");
         }
 
         return new File[] {new File(script)};
diff --git a/setup/db/db/schema-441to442.sql b/setup/db/db/schema-441to442.sql
@@ -0,0 +1,21 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+--;
+-- Schema upgrade from 4.4.1 to 4.4.2;
+--;
+
diff --git a/setup/db/db/schema-442to450-cleanup.sql b/setup/db/db/schema-442to450-cleanup.sql
@@ -16,7 +16,7 @@
 -- under the License.
 
 --
--- Schema cleanup from 4.4.0 to 4.5.0
+-- Schema cleanup from 4.4.2 to 4.5.0
 --
 
 UPDATE `cloud`.`configuration`
diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql
@@ -16,7 +16,7 @@
 -- under the License.
 
 --
--- Schema upgrade from 4.4.1 to 4.5.0
+-- Schema upgrade from 4.4.2 to 4.5.0
 --
 
 -- Disable foreign key checking
