dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

constraint rename, EntityType enum fix

Browse Source
This commit is contained in:
dashevchenko 2024-10-10 14:08:12 +03:00
parent 06ad4bdc43
commit 8c9bb7a0db
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/data/upgrade/3.8.0/schema_update.sql
View File

@ -140,6 +140,7 @@ $$
UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.ios_app_id = iosAppId) WHERE id = qrCodeRecord.id;
END IF;
END LOOP;
ALTER TABLE qr_code_settings RENAME CONSTRAINT mobile_app_settings_tenant_id_unq_key TO qr_code_settings_tenant_id_unq_key;
END IF;
ALTER TABLE qr_code_settings DROP COLUMN IF EXISTS android_config, DROP COLUMN IF EXISTS ios_config;
END;

6
application/src/main/java/org/thingsboard/server/controller/BaseController.java
View File

@ -201,10 +201,10 @@ import static org.thingsboard.server.dao.service.Validator.validateId;
@TbCoreComponent
public abstract class BaseController {
public static final String DASHBOARD_ID = "dashboardId";
protected static final String DASHBOARD_ID = "dashboardId";
public static final String HOME_DASHBOARD_ID = "homeDashboardId";
public static final String HOME_DASHBOARD_HIDE_TOOLBAR = "homeDashboardHideToolbar";
protected static final String HOME_DASHBOARD_ID = "homeDashboardId";
protected static final String HOME_DASHBOARD_HIDE_TOOLBAR = "homeDashboardHideToolbar";
protected final Logger log = org.slf4j.LoggerFactory.getLogger(getClass());

2
common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
View File

@ -61,7 +61,7 @@ public enum EntityType {
OAUTH2_CLIENT(35),
DOMAIN(36),
MOBILE_APP(37),
MOBILE_APP_BUNDLE(37);
MOBILE_APP_BUNDLE(38);
@Getter
private final int protoNumber; // Corresponds to EntityTypeProto

2
dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java
View File

@ -60,7 +60,7 @@ public class QrCodeSettingServiceImpl extends AbstractCachedEntityService<Tenant
} catch (Exception e) {
handleEvictEvent(new QrCodeSettingsEvictEvent(tenantId));
checkConstraintViolation(e, Map.of(
"mobile_app_settings_tenant_id_unq_key", "Mobile application for specified tenant already exists!"
"qr_code_settings_tenant_id_unq_key", "Mobile application for specified tenant already exists!"
));
throw e;
}

2
dao/src/main/resources/sql/schema-entities.sql
View File

@ -911,5 +911,5 @@ CREATE TABLE IF NOT EXISTS qr_code_settings (
use_default_app boolean,
mobile_app_bundle_id uuid,
qr_code_config VARCHAR(100000),
CONSTRAINT mobile_app_settings_tenant_id_unq_key UNIQUE (tenant_id)
CONSTRAINT qr_code_settings_tenant_id_unq_key UNIQUE (tenant_id)
);