Skip to content

Changes database upgrade script names to be consistent for the 4.9.1.0 release #1665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Sep 2, 2016
Merged

Changes database upgrade script names to be consistent for the 4.9.1.0 release #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 56 additions & 56 deletions engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions ...om/cloud/upgrade/dao/Upgrade490to491.java → ...m/cloud/upgrade/dao/Upgrade490to4910.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@

import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
import org.apache.log4j.Logger;

import java.io.File;
import java.sql.Connection;

public class Upgrade490to491 implements DbUpgrade {
final static Logger s_logger = Logger.getLogger(Upgrade490to491.class);
public class Upgrade490to4910 implements DbUpgrade {

@Override
public String[] getUpgradableVersionRange() {
Expand All @@ -44,9 +42,9 @@ public boolean supportsRollingUpgrade() {

@Override
public File[] getPrepareScripts() {
String script = Script.findScript("", "db/schema-490to491.sql");
String script = Script.findScript("", "db/schema-490to4910.sql");
if (script == null) {
throw new CloudRuntimeException("Unable to find db/schema-490to491.sql");
throw new CloudRuntimeException("Unable to find db/schema-490to4910.sql");
}
return new File[] {new File(script)};
}
Expand All @@ -57,9 +55,9 @@ public void performDataMigration(Connection conn) {

@Override
public File[] getCleanupScripts() {
String script = Script.findScript("", "db/schema-490to491-cleanup.sql");
String script = Script.findScript("", "db/schema-490to4910-cleanup.sql");
if (script == null) {
throw new CloudRuntimeException("Unable to find db/schema-490to491-cleanup.sql");
throw new CloudRuntimeException("Unable to find db/schema-490to4910-cleanup.sql");
}
return new File[] {new File(script)};
}
Expand Down
4 changes: 2 additions & 2 deletions engine/schema/test/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.cloud.upgrade.dao.Upgrade470to471;
import com.cloud.upgrade.dao.Upgrade471to480;
import com.cloud.upgrade.dao.Upgrade480to481;
import com.cloud.upgrade.dao.Upgrade490to491;
import com.cloud.upgrade.dao.Upgrade490to4910;
import org.apache.cloudstack.utils.CloudStackVersion;
import org.junit.Test;

Expand Down Expand Up @@ -67,7 +67,7 @@ public void testCalculateUpgradePath490to4910() {

assertNotNull(upgrades);
assertEquals(1, upgrades.length);
assertTrue(upgrades[0] instanceof Upgrade490to491);
assertTrue(upgrades[0] instanceof Upgrade490to4910);

assertTrue(Arrays.equals(new String[] { "4.9.0", currentVersion.toString()}, upgrades[0].getUpgradableVersionRange()));
assertEquals(currentVersion.toString(), upgrades[0].getUpgradedVersion());
Expand Down
0 setup/db/db/schema-490to491-cleanup.sql → setup/db/db/schema-490to4910-cleanup.sql
View file
Open in desktop
File renamed without changes.
0 setup/db/db/schema-490to491.sql → setup/db/db/schema-490to4910.sql
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/marvin/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
raise RuntimeError("python setuptools is required to build Marvin")


VERSION = "4.9.1.0"
VERSION = "4.9.1.0-SNAPSHOT"

setup(name="Marvin",
version=VERSION,
Expand Down