Merge branch 'hotfix/3.6.3' of github.com:thingsboard/thingsboard into hotfix/3.6.3

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

@@ -127,6 +127,9 @@ public class ThingsboardInstallService {
                             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
                             break;
                         default:

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

@@ -115,6 +115,9 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
             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);
         }

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;
 $$;