Merge pull request #14937 from thingsboard/fix/upgrade-4.2

Upgrade improvements for 4.2

application/src/main/data/upgrade/basic/schema_update.sql

@@ -14,3 +14,33 @@
 -- limitations under the License.
 --
 
+-- UPDATE OTA PACKAGE EXTERNAL ID START
+
+ALTER TABLE ota_package
+    ADD COLUMN IF NOT EXISTS external_id uuid;
+
+DO
+$$
+    BEGIN
+        IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'ota_package_external_id_unq_key') THEN
+            ALTER TABLE ota_package ADD CONSTRAINT ota_package_external_id_unq_key UNIQUE (tenant_id, external_id);
+        END IF;
+    END;
+$$;
+
+-- UPDATE OTA PACKAGE EXTERNAL ID END
+
+-- DROP INDEXES THAT DUPLICATE UNIQUE CONSTRAINT START
+
+DROP INDEX IF EXISTS idx_device_external_id;
+DROP INDEX IF EXISTS idx_device_profile_external_id;
+DROP INDEX IF EXISTS idx_asset_external_id;
+DROP INDEX IF EXISTS idx_entity_view_external_id;
+DROP INDEX IF EXISTS idx_rule_chain_external_id;
+DROP INDEX IF EXISTS idx_dashboard_external_id;
+DROP INDEX IF EXISTS idx_customer_external_id;
+DROP INDEX IF EXISTS idx_widgets_bundle_external_id;
+
+-- DROP INDEXES THAT DUPLICATE UNIQUE CONSTRAINT END
+
+ALTER TABLE mobile_app ADD COLUMN IF NOT EXISTS title varchar(255);

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

@@ -21,16 +21,18 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.service.install.update.DefaultDataUpdateService;
 
-import java.util.List;
+import java.util.Map;
 
 @Service
 @Slf4j
 @RequiredArgsConstructor
 public class DefaultDatabaseSchemaSettingsService implements DatabaseSchemaSettingsService {
 
-    // This list should include all versions that are compatible for the upgrade in 4 digits format (like 4.2.0.0, etc.).
+    // map of versions from which the upgrade to the current version is possible
-    // The compatibility cycle usually breaks when we have some scripts written in Java that may not work after a new release.
+    // key - supported version prefix, value - display name
-    private static final List<String> SUPPORTED_VERSIONS_FOR_UPGRADE = List.of("4.2.1.0");
+    private static final Map<String, String> SUPPORTED_VERSIONS_FOR_UPGRADE = Map.of(
+            "4.2.0", "4.2.0"
+    );
 
     private final ProjectInfo projectInfo;
     private final JdbcTemplate jdbcTemplate;
@@ -55,9 +57,9 @@ public class DefaultDatabaseSchemaSettingsService implements DatabaseSchemaSetti
             onSchemaSettingsError("Upgrade failed: database already upgraded to current version. You can set SKIP_SCHEMA_VERSION_CHECK to 'true' if force re-upgrade needed.");
         }
 
-        if (!SUPPORTED_VERSIONS_FOR_UPGRADE.contains(dbSchemaVersion)) {
+        if (SUPPORTED_VERSIONS_FOR_UPGRADE.keySet().stream().noneMatch(dbSchemaVersion::startsWith)) {
             onSchemaSettingsError(String.format("Upgrade failed: database version '%s' is not supported for upgrade. Supported versions are: %s.",
-                    dbSchemaVersion, SUPPORTED_VERSIONS_FOR_UPGRADE
+                    dbSchemaVersion, SUPPORTED_VERSIONS_FOR_UPGRADE.values()
             ));
         }
     }