diff --git a/application/src/main/data/upgrade/3.1.2/schema_update_after.sql b/application/src/main/data/upgrade/3.1.1/schema_update_after.sql similarity index 100% rename from application/src/main/data/upgrade/3.1.2/schema_update_after.sql rename to application/src/main/data/upgrade/3.1.1/schema_update_after.sql diff --git a/application/src/main/data/upgrade/3.1.2/schema_update_before.sql b/application/src/main/data/upgrade/3.1.1/schema_update_before.sql similarity index 100% rename from application/src/main/data/upgrade/3.1.2/schema_update_before.sql rename to application/src/main/data/upgrade/3.1.1/schema_update_before.sql diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java index 45c727a692..0e524e9e5c 100644 --- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java +++ b/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; diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java index ab87a8ab61..d6068b9616 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java +++ b/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;");