Merge remote-tracking branch 'ce/release-3.6' into develop/3.6.4

thingsboard · Apr 11, 2024 · 9e250d1 · 9e250d1
2 parents 63a2888 + 0c25a3b
commit 9e250d1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -127,6 +127,9 @@ public void performInstall() {
                             log.info("Upgrading ThingsBoard from version 3.6.2 to 3.6.3 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.2");
                             systemDataLoaderService.updateDefaultNotificationConfigs();
+                        case "3.6.3":
+                            log.info("Upgrading ThingsBoard from version 3.6.3 to 3.6.4 ...");
+                            databaseEntitiesUpgradeService.upgradeDatabase("3.6.3");
                             //TODO DON'T FORGET to update switch statement in the CacheCleanupService if you need to clear the cache
                         case "edge": // leave this after latest case version
                             // reset full sync required - to upload the latest widgets from cloud

diff --git a/...ation/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/...ation/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
@@ -120,6 +120,9 @@ public void upgradeDatabase(String fromVersion) throws Exception {
             case "3.6.2":
                 updateSchema("3.6.2", 3006002, "3.6.3", 3006003, null);
                 break;
+            case "3.6.3":
+                updateSchema("3.6.3", 3006003, "3.6.4", 3006004, null);
+                break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
         }

diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql
@@ -25,7 +25,7 @@ CREATE OR REPLACE PROCEDURE insert_tb_schema_settings()
 $$
 BEGIN
     IF (SELECT COUNT(*) FROM tb_schema_settings) = 0 THEN
-        INSERT INTO tb_schema_settings (schema_version) VALUES (3006000);
+        INSERT INTO tb_schema_settings (schema_version) VALUES (3006004);
     END IF;
 END;
 $$;

diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml
@@ -38,7 +38,7 @@
         <tb-postgres.docker.name>tb-postgres</tb-postgres.docker.name>
         <tb-cassandra.docker.name>tb-cassandra</tb-cassandra.docker.name>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
-        <pkg.upgradeVersion>3.6.3</pkg.upgradeVersion>
+        <pkg.upgradeVersion>3.6.4</pkg.upgradeVersion>
     </properties>
 
     <dependencies>