From 6e4e5873053bc52e00ba3b872cb0a7fbb05ad32c Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Mon, 16 Mar 2020 16:50:37 +0200 Subject: [PATCH 1/2] Updated upgrade path --- .../cloud/upgrade/DatabaseUpgradeChecker.java | 2 ++ .../upgrade/dao/Upgrade41300to41310.java | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41310.java diff --git a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java index 0ffb5fadb7b6..301594ddf3ed 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -66,6 +66,7 @@ import com.cloud.upgrade.dao.Upgrade41120to41130; import com.cloud.upgrade.dao.Upgrade41120to41200; import com.cloud.upgrade.dao.Upgrade41200to41300; +import com.cloud.upgrade.dao.Upgrade41300to41310; import com.cloud.upgrade.dao.Upgrade420to421; import com.cloud.upgrade.dao.Upgrade421to430; import com.cloud.upgrade.dao.Upgrade430to440; @@ -187,6 +188,7 @@ public DatabaseUpgradeChecker() { .next("4.11.2.0", new Upgrade41120to41130()) .next("4.11.3.0", new Upgrade41120to41200()) .next("4.12.0.0", new Upgrade41200to41300()) + .next("4.13.0.0", new Upgrade41300to41310()) .build(); } diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41310.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41310.java new file mode 100644 index 000000000000..dcf66ef2ec72 --- /dev/null +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41310.java @@ -0,0 +1,36 @@ +package com.cloud.upgrade.dao; + +import java.io.InputStream; +import java.sql.Connection; + +public class Upgrade41300to41310 implements DbUpgrade { + @Override + public String[] getUpgradableVersionRange() { + return new String[] {"4.13.0.0", "4.13.1.0"}; + } + + @Override + public String getUpgradedVersion() { + return "4.13.1.0"; + } + + @Override + public boolean supportsRollingUpgrade() { + return false; + } + + @Override + public InputStream[] getPrepareScripts() { + return new InputStream[0]; + } + + @Override + public void performDataMigration(Connection conn) { + + } + + @Override + public InputStream[] getCleanupScripts() { + return new InputStream[0]; + } +} From 1c5b848e25367203c7988df7da0fccf24268c775 Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Tue, 17 Mar 2020 10:41:13 +0200 Subject: [PATCH 2/2] Added license info --- .../cloud/upgrade/dao/Upgrade41300to41310.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41310.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41310.java index dcf66ef2ec72..ac6149f78447 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41310.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41310.java @@ -1,3 +1,19 @@ +// 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.InputStream;