Browse Source

Move update scripts to ver.2.0.0

pull/804/head
Igor Kulikov 9 years ago
parent
commit
d1552a13b4
  1. 0
      application/src/main/data/upgrade/2.0.0/schema_update.cql
  2. 0
      application/src/main/data/upgrade/2.0.0/schema_update.sql
  3. 2
      application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
  4. 2
      application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java
  5. 2
      application/src/main/java/org/thingsboard/server/service/install/DefaultDataUpdateService.java
  6. 2
      application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

0
application/src/main/data/upgrade/1.5.0/schema_update.cql → application/src/main/data/upgrade/2.0.0/schema_update.cql

0
application/src/main/data/upgrade/1.5.0/schema_update.sql → application/src/main/data/upgrade/2.0.0/schema_update.sql

2
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");

2
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.");

2
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:

2
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.");

Loading…
Cancel
Save