From d1552a13b469694a1d57a37c8b91ab51ad545536 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 24 May 2018 10:04:05 +0300 Subject: [PATCH] Move update scripts to ver.2.0.0 --- .../src/main/data/upgrade/{1.5.0 => 2.0.0}/schema_update.cql | 0 .../src/main/data/upgrade/{1.5.0 => 2.0.0}/schema_update.sql | 0 .../thingsboard/server/install/ThingsboardInstallService.java | 2 +- .../server/service/install/CassandraDatabaseUpgradeService.java | 2 +- .../server/service/install/DefaultDataUpdateService.java | 2 +- .../server/service/install/SqlDatabaseUpgradeService.java | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename application/src/main/data/upgrade/{1.5.0 => 2.0.0}/schema_update.cql (100%) rename application/src/main/data/upgrade/{1.5.0 => 2.0.0}/schema_update.sql (100%) diff --git a/application/src/main/data/upgrade/1.5.0/schema_update.cql b/application/src/main/data/upgrade/2.0.0/schema_update.cql similarity index 100% rename from application/src/main/data/upgrade/1.5.0/schema_update.cql rename to application/src/main/data/upgrade/2.0.0/schema_update.cql diff --git a/application/src/main/data/upgrade/1.5.0/schema_update.sql b/application/src/main/data/upgrade/2.0.0/schema_update.sql similarity index 100% rename from application/src/main/data/upgrade/1.5.0/schema_update.sql rename to application/src/main/data/upgrade/2.0.0/schema_update.sql diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java index d2ae77cc3d..f863d0bb2a 100644 --- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java +++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java @@ -82,7 +82,7 @@ public class ThingsboardInstallService { databaseUpgradeService.upgradeDatabase("1.3.1"); case "1.4.0": - log.info("Upgrading ThingsBoard from version 1.4.0 to 1.5.0 ..."); + log.info("Upgrading ThingsBoard from version 1.4.0 to 2.0.0 ..."); databaseUpgradeService.upgradeDatabase("1.4.0"); diff --git a/application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java index d38cddd4a1..4d2adeaad1 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java @@ -198,7 +198,7 @@ public class CassandraDatabaseUpgradeService implements DatabaseUpgradeService { case "1.4.0": log.info("Updating schema ..."); - schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "1.5.0", SCHEMA_UPDATE_CQL); + schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "2.0.0", SCHEMA_UPDATE_CQL); loadCql(schemaUpdateFile); log.info("Schema updated."); diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultDataUpdateService.java index 37e5b30d11..b3723682e2 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/DefaultDataUpdateService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultDataUpdateService.java @@ -47,7 +47,7 @@ public class DefaultDataUpdateService implements DataUpdateService { public void updateData(String fromVersion) throws Exception { switch (fromVersion) { case "1.4.0": - log.info("Updating data from version 1.4.0 to 1.5.0 ..."); + log.info("Updating data from version 1.4.0 to 2.0.0 ..."); tenantsDefaultRuleChainUpdater.updateEntities(null); break; default: diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java index ecb607084c..29d5c65be9 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java @@ -104,7 +104,7 @@ public class SqlDatabaseUpgradeService implements DatabaseUpgradeService { case "1.4.0": try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) { log.info("Updating schema ..."); - schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "1.5.0", SCHEMA_UPDATE_SQL); + schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "2.0.0", SCHEMA_UPDATE_SQL); String sql = new String(Files.readAllBytes(schemaUpdateFile), Charset.forName("UTF-8")); conn.createStatement().execute(sql); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script log.info("Schema updated.");