From c748963ec893f07c9859c6b13afdc45309b8e493 Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Mon, 29 Apr 2024 15:43:21 +0300 Subject: [PATCH] fixed locale.constant-en_US.json, lower case for sql-queries --- .../server/dao/sql/query/EntityKeyMapping.java | 8 ++++---- ui-ngx/src/assets/locale/locale.constant-en_US.json | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java index c939197faa..340165e087 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java @@ -84,11 +84,11 @@ public class EntityKeyMapping { public static final String OWNER_NAME = "ownerName"; public static final String OWNER_TYPE = "ownerType"; public static final String OWNER_NAME_SELECT_QUERY = "case when e.customer_id = '" + NULL_UUID + "' " + - "THEN (select title from tenant where id = e.tenant_id) " + - "ELSE (select title from customer where id = e.customer_id) END"; + "then (select title from tenant where id = e.tenant_id) " + + "else (select title from customer where id = e.customer_id) end"; public static final String OWNER_TYPE_SELECT_QUERY = "case when e.customer_id = '" + NULL_UUID + "' " + - "THEN 'TENANT' " + - "ELSE 'CUSTOMER' END"; + "then 'TENANT' " + + "else 'CUSTOMER' end"; public static final Map ownerPropertiesFunctions = Map.of( OWNER_NAME, OWNER_NAME_SELECT_QUERY, OWNER_TYPE, OWNER_TYPE_SELECT_QUERY diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 3c23d48aae..4117492c6a 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -2274,7 +2274,6 @@ "label": "Label", "queue-name": "Queue name", "service-id": "Service Id", - "label": "Label", "owner-name": "Owner name", "owner-type": "Owner type" },