Browse Source

Merge branch 'develop/3.7.2' into feature/user-security-info

# Conflicts:
#	application/src/main/data/upgrade/3.7.1/schema_update.sql
pull/11671/head
ViacheslavKlimov 2 years ago
parent
commit
264304fd99
  1. 3
      application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
  2. 3
      application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

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

@ -140,6 +140,9 @@ public class ThingsboardInstallService {
case "3.7.0":
log.info("Upgrading ThingsBoard from version 3.7.0 to 3.7.1 ...");
databaseEntitiesUpgradeService.upgradeDatabase("3.7.0");
case "3.7.1":
log.info("Upgrading ThingsBoard from version 3.7.1 to 3.7.2 ...");
databaseEntitiesUpgradeService.upgradeDatabase("3.7.1");
//TODO DON'T FORGET to update switch statement in the CacheCleanupService if you need to clear the cache
break;
default:

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

@ -124,6 +124,9 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
case "3.7.0":
updateSchema("3.7.0", 3007000, "3.7.1", 3007001, null);
break;
case "3.7.1":
updateSchema("3.7.1", 3007001, "3.7.2", 3007002, null);
break;
default:
throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
}

Loading…
Cancel
Save