Commit d1552a13b469694a1d57a37c8b91ab51ad545536

Authored by Igor Kulikov
1 parent f19b2efb

Move update scripts to ver.2.0.0

application/src/main/data/upgrade/2.0.0/schema_update.cql renamed from application/src/main/data/upgrade/1.5.0/schema_update.cql
application/src/main/data/upgrade/2.0.0/schema_update.sql renamed from application/src/main/data/upgrade/1.5.0/schema_update.sql
... ... @@ -82,7 +82,7 @@ public class ThingsboardInstallService {
82 82 databaseUpgradeService.upgradeDatabase("1.3.1");
83 83
84 84 case "1.4.0":
85   - log.info("Upgrading ThingsBoard from version 1.4.0 to 1.5.0 ...");
  85 + log.info("Upgrading ThingsBoard from version 1.4.0 to 2.0.0 ...");
86 86
87 87 databaseUpgradeService.upgradeDatabase("1.4.0");
88 88
... ...
... ... @@ -198,7 +198,7 @@ public class CassandraDatabaseUpgradeService implements DatabaseUpgradeService {
198 198 case "1.4.0":
199 199
200 200 log.info("Updating schema ...");
201   - schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "1.5.0", SCHEMA_UPDATE_CQL);
  201 + schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "2.0.0", SCHEMA_UPDATE_CQL);
202 202 loadCql(schemaUpdateFile);
203 203 log.info("Schema updated.");
204 204
... ...
... ... @@ -47,7 +47,7 @@ public class DefaultDataUpdateService implements DataUpdateService {
47 47 public void updateData(String fromVersion) throws Exception {
48 48 switch (fromVersion) {
49 49 case "1.4.0":
50   - log.info("Updating data from version 1.4.0 to 1.5.0 ...");
  50 + log.info("Updating data from version 1.4.0 to 2.0.0 ...");
51 51 tenantsDefaultRuleChainUpdater.updateEntities(null);
52 52 break;
53 53 default:
... ...
... ... @@ -104,7 +104,7 @@ public class SqlDatabaseUpgradeService implements DatabaseUpgradeService {
104 104 case "1.4.0":
105 105 try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
106 106 log.info("Updating schema ...");
107   - schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "1.5.0", SCHEMA_UPDATE_SQL);
  107 + schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "2.0.0", SCHEMA_UPDATE_SQL);
108 108 String sql = new String(Files.readAllBytes(schemaUpdateFile), Charset.forName("UTF-8"));
109 109 conn.createStatement().execute(sql); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
110 110 log.info("Schema updated.");
... ...