Showing
6 changed files
with
4 additions
and
4 deletions
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,7 +82,7 @@ public class ThingsboardInstallService { | ||
| 82 | databaseUpgradeService.upgradeDatabase("1.3.1"); | 82 | databaseUpgradeService.upgradeDatabase("1.3.1"); |
| 83 | 83 | ||
| 84 | case "1.4.0": | 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 | databaseUpgradeService.upgradeDatabase("1.4.0"); | 87 | databaseUpgradeService.upgradeDatabase("1.4.0"); |
| 88 | 88 |
| @@ -198,7 +198,7 @@ public class CassandraDatabaseUpgradeService implements DatabaseUpgradeService { | @@ -198,7 +198,7 @@ public class CassandraDatabaseUpgradeService implements DatabaseUpgradeService { | ||
| 198 | case "1.4.0": | 198 | case "1.4.0": |
| 199 | 199 | ||
| 200 | log.info("Updating schema ..."); | 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 | loadCql(schemaUpdateFile); | 202 | loadCql(schemaUpdateFile); |
| 203 | log.info("Schema updated."); | 203 | log.info("Schema updated."); |
| 204 | 204 |
| @@ -47,7 +47,7 @@ public class DefaultDataUpdateService implements DataUpdateService { | @@ -47,7 +47,7 @@ public class DefaultDataUpdateService implements DataUpdateService { | ||
| 47 | public void updateData(String fromVersion) throws Exception { | 47 | public void updateData(String fromVersion) throws Exception { |
| 48 | switch (fromVersion) { | 48 | switch (fromVersion) { |
| 49 | case "1.4.0": | 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 | tenantsDefaultRuleChainUpdater.updateEntities(null); | 51 | tenantsDefaultRuleChainUpdater.updateEntities(null); |
| 52 | break; | 52 | break; |
| 53 | default: | 53 | default: |
| @@ -104,7 +104,7 @@ public class SqlDatabaseUpgradeService implements DatabaseUpgradeService { | @@ -104,7 +104,7 @@ public class SqlDatabaseUpgradeService implements DatabaseUpgradeService { | ||
| 104 | case "1.4.0": | 104 | case "1.4.0": |
| 105 | try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) { | 105 | try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) { |
| 106 | log.info("Updating schema ..."); | 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 | String sql = new String(Files.readAllBytes(schemaUpdateFile), Charset.forName("UTF-8")); | 108 | String sql = new String(Files.readAllBytes(schemaUpdateFile), Charset.forName("UTF-8")); |
| 109 | conn.createStatement().execute(sql); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script | 109 | conn.createStatement().execute(sql); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script |
| 110 | log.info("Schema updated."); | 110 | log.info("Schema updated."); |