Browse Source

Update upgrade scripts

pull/3551/head
Igor Kulikov 6 years ago
parent
commit
907ed5ad83
  1. 0
      application/src/main/data/upgrade/3.1.1/schema_update_after.sql
  2. 0
      application/src/main/data/upgrade/3.1.1/schema_update_before.sql
  3. 6
      application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
  4. 6
      application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

0
application/src/main/data/upgrade/3.1.2/schema_update_after.sql → application/src/main/data/upgrade/3.1.1/schema_update_after.sql

0
application/src/main/data/upgrade/3.1.2/schema_update_before.sql → application/src/main/data/upgrade/3.1.1/schema_update_before.sql

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

@ -176,13 +176,11 @@ public class ThingsboardInstallService {
log.info("Upgrading ThingsBoard from version 3.1.0 to 3.1.1 ...");
databaseEntitiesUpgradeService.upgradeDatabase("3.1.0");
case "3.1.1":
log.info("Upgrading ThingsBoard from version 3.1.1 to 3.1.2 ...");
log.info("Upgrading ThingsBoard from version 3.1.1 to 3.2.0 ...");
if (databaseTsUpgradeService != null) {
databaseTsUpgradeService.upgradeDatabase("3.1.1");
}
case "3.1.2":
log.info("Upgrading ThingsBoard from version 3.1.2 to 3.2.0 ...");
databaseEntitiesUpgradeService.upgradeDatabase("3.1.2");
databaseEntitiesUpgradeService.upgradeDatabase("3.1.1");
log.info("Updating system data...");
systemDataLoaderService.updateSystemWidgets();
break;

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

@ -324,7 +324,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
log.info("Schema updated.");
}
break;
case "3.1.2":
case "3.1.1":
try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
log.info("Updating schema ...");
if (isOldSchema(conn, 3001000)) {
@ -352,7 +352,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
} catch (Exception e) {
}
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.2", "schema_update_before.sql");
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.1", "schema_update_before.sql");
loadSql(schemaUpdateFile, conn);
log.info("Creating default tenant profiles...");
@ -385,7 +385,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
log.info("Updating device profiles...");
conn.createStatement().execute("call update_device_profiles()");
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.2", "schema_update_after.sql");
schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.1", "schema_update_after.sql");
loadSql(schemaUpdateFile, conn);
conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3002000;");

Loading…
Cancel
Save