Browse Source

Was modified classes to config and create DB for EntityView model

pull/1053/head
viktorbasanets 8 years ago
parent
commit
8fdfa909db
  1. 7
      application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
  2. 4
      application/src/main/java/org/thingsboard/server/service/install/DefaultDataUpdateService.java
  3. 9
      application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

7
application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java

@ -88,6 +88,13 @@ public class ThingsboardInstallService {
dataUpdateService.updateData("1.4.0");
case "2.0.0":
log.info("Upgrading ThingsBoard from version 2.0.0 to 2.1.1 ...");
databaseUpgradeService.upgradeDatabase("2.0.0");
dataUpdateService.updateData("2.0.0");
log.info("Updating system data...");
systemDataLoaderService.deleteSystemWidgetBundle("charts");

4
application/src/main/java/org/thingsboard/server/service/install/DefaultDataUpdateService.java

@ -49,6 +49,10 @@ public class DefaultDataUpdateService implements DataUpdateService {
log.info("Updating data from version 1.4.0 to 2.0.0 ...");
tenantsDefaultRuleChainUpdater.updateEntities(null);
break;
case "2.0.0":
log.info("Updating data from version 2.0.0 to 2.1.1 ...");
tenantsDefaultRuleChainUpdater.updateEntities(null);
break;
default:
throw new RuntimeException("Unable to update data, unsupported fromVersion: " + fromVersion);
}

9
application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@ -107,6 +107,15 @@ public class SqlDatabaseUpgradeService implements DatabaseUpgradeService {
log.info("Schema updated.");
}
break;
case "2.0.0":
try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
log.info("Updating schema ...");
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "2.1.1", SCHEMA_UPDATE_SQL);
loadSql(schemaUpdateFile, conn);
log.info("Schema updated.");
}
break;
default:
throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
}

Loading…
Cancel
Save