Showing
4 changed files
with
5 additions
and
7 deletions
application/src/main/data/upgrade/3.1.1/schema_update_after.sql
renamed from
application/src/main/data/upgrade/3.1.2/schema_update_after.sql
application/src/main/data/upgrade/3.1.1/schema_update_before.sql
renamed from
application/src/main/data/upgrade/3.1.2/schema_update_before.sql
| @@ -176,13 +176,11 @@ public class ThingsboardInstallService { | @@ -176,13 +176,11 @@ public class ThingsboardInstallService { | ||
| 176 | log.info("Upgrading ThingsBoard from version 3.1.0 to 3.1.1 ..."); | 176 | log.info("Upgrading ThingsBoard from version 3.1.0 to 3.1.1 ..."); |
| 177 | databaseEntitiesUpgradeService.upgradeDatabase("3.1.0"); | 177 | databaseEntitiesUpgradeService.upgradeDatabase("3.1.0"); |
| 178 | case "3.1.1": | 178 | case "3.1.1": |
| 179 | - log.info("Upgrading ThingsBoard from version 3.1.1 to 3.1.2 ..."); | 179 | + log.info("Upgrading ThingsBoard from version 3.1.1 to 3.2.0 ..."); |
| 180 | if (databaseTsUpgradeService != null) { | 180 | if (databaseTsUpgradeService != null) { |
| 181 | databaseTsUpgradeService.upgradeDatabase("3.1.1"); | 181 | databaseTsUpgradeService.upgradeDatabase("3.1.1"); |
| 182 | } | 182 | } |
| 183 | - case "3.1.2": | ||
| 184 | - log.info("Upgrading ThingsBoard from version 3.1.2 to 3.2.0 ..."); | ||
| 185 | - databaseEntitiesUpgradeService.upgradeDatabase("3.1.2"); | 183 | + databaseEntitiesUpgradeService.upgradeDatabase("3.1.1"); |
| 186 | log.info("Updating system data..."); | 184 | log.info("Updating system data..."); |
| 187 | systemDataLoaderService.updateSystemWidgets(); | 185 | systemDataLoaderService.updateSystemWidgets(); |
| 188 | break; | 186 | break; |
| @@ -324,7 +324,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService | @@ -324,7 +324,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService | ||
| 324 | log.info("Schema updated."); | 324 | log.info("Schema updated."); |
| 325 | } | 325 | } |
| 326 | break; | 326 | break; |
| 327 | - case "3.1.2": | 327 | + case "3.1.1": |
| 328 | try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) { | 328 | try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) { |
| 329 | log.info("Updating schema ..."); | 329 | log.info("Updating schema ..."); |
| 330 | if (isOldSchema(conn, 3001000)) { | 330 | if (isOldSchema(conn, 3001000)) { |
| @@ -352,7 +352,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService | @@ -352,7 +352,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService | ||
| 352 | } catch (Exception e) { | 352 | } catch (Exception e) { |
| 353 | } | 353 | } |
| 354 | 354 | ||
| 355 | - schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.2", "schema_update_before.sql"); | 355 | + schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.1", "schema_update_before.sql"); |
| 356 | loadSql(schemaUpdateFile, conn); | 356 | loadSql(schemaUpdateFile, conn); |
| 357 | 357 | ||
| 358 | log.info("Creating default tenant profiles..."); | 358 | log.info("Creating default tenant profiles..."); |
| @@ -385,7 +385,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService | @@ -385,7 +385,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService | ||
| 385 | log.info("Updating device profiles..."); | 385 | log.info("Updating device profiles..."); |
| 386 | conn.createStatement().execute("call update_device_profiles()"); | 386 | conn.createStatement().execute("call update_device_profiles()"); |
| 387 | 387 | ||
| 388 | - schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.2", "schema_update_after.sql"); | 388 | + schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.1", "schema_update_after.sql"); |
| 389 | loadSql(schemaUpdateFile, conn); | 389 | loadSql(schemaUpdateFile, conn); |
| 390 | 390 | ||
| 391 | conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3002000;"); | 391 | conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3002000;"); |