From b0b0777d343da552b9fd2cdd1c288447c79d90bc Mon Sep 17 00:00:00 2001 From: imbeacon Date: Wed, 29 Mar 2023 12:36:58 +0300 Subject: [PATCH] Added check for empty string in title/label --- application/src/main/data/upgrade/3.4.4/schema_update.sql | 8 ++++---- dao/src/main/resources/sql/schema-entities.sql | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/src/main/data/upgrade/3.4.4/schema_update.sql b/application/src/main/data/upgrade/3.4.4/schema_update.sql index fc0f7d7b8e..6860adc612 100644 --- a/application/src/main/data/upgrade/3.4.4/schema_update.sql +++ b/application/src/main/data/upgrade/3.4.4/schema_update.sql @@ -193,15 +193,15 @@ COALESCE(CASE WHEN a.originator_type = 0 THEN (select title from tenant where id WHEN a.originator_type = 18 THEN (select name from edge where id = a.originator_id) END , 'Deleted') originator_name, COALESCE(CASE WHEN a.originator_type = 0 THEN (select title from tenant where id = a.originator_id) - WHEN a.originator_type = 1 THEN (select COALESCE(title, email) from customer where id = a.originator_id) + WHEN a.originator_type = 1 THEN (select COALESCE(NULLIF(title, ''), email) from customer where id = a.originator_id) WHEN a.originator_type = 2 THEN (select email from tb_user where id = a.originator_id) WHEN a.originator_type = 3 THEN (select title from dashboard where id = a.originator_id) - WHEN a.originator_type = 4 THEN (select COALESCE(label, name) from asset where id = a.originator_id) - WHEN a.originator_type = 5 THEN (select COALESCE(label, name) from device where id = a.originator_id) + WHEN a.originator_type = 4 THEN (select COALESCE(NULLIF(label, ''), name) from asset where id = a.originator_id) + WHEN a.originator_type = 5 THEN (select COALESCE(NULLIF(label, ''), name) from device where id = a.originator_id) WHEN a.originator_type = 9 THEN (select name from entity_view where id = a.originator_id) WHEN a.originator_type = 13 THEN (select name from device_profile where id = a.originator_id) WHEN a.originator_type = 14 THEN (select name from asset_profile where id = a.originator_id) - WHEN a.originator_type = 18 THEN (select COALESCE(label, name) from edge where id = a.originator_id) END + WHEN a.originator_type = 18 THEN (select COALESCE(NULLIF(label, ''), name) from edge where id = a.originator_id) END , 'Deleted') as originator_label, u.first_name as assignee_first_name, u.last_name as assignee_last_name, u.email as assignee_email FROM alarm a diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql index 7d47138bab..4e60c7105e 100644 --- a/dao/src/main/resources/sql/schema-entities.sql +++ b/dao/src/main/resources/sql/schema-entities.sql @@ -874,15 +874,15 @@ COALESCE(CASE WHEN a.originator_type = 0 THEN (select title from tenant where id WHEN a.originator_type = 18 THEN (select name from edge where id = a.originator_id) END , 'Deleted') originator_name, COALESCE(CASE WHEN a.originator_type = 0 THEN (select title from tenant where id = a.originator_id) - WHEN a.originator_type = 1 THEN (select COALESCE(title, email) from customer where id = a.originator_id) + WHEN a.originator_type = 1 THEN (select COALESCE(NULLIF(title, ''), email) from customer where id = a.originator_id) WHEN a.originator_type = 2 THEN (select email from tb_user where id = a.originator_id) WHEN a.originator_type = 3 THEN (select title from dashboard where id = a.originator_id) - WHEN a.originator_type = 4 THEN (select COALESCE(label, name) from asset where id = a.originator_id) - WHEN a.originator_type = 5 THEN (select COALESCE(label, name) from device where id = a.originator_id) + WHEN a.originator_type = 4 THEN (select COALESCE(NULLIF(label, ''), name) from asset where id = a.originator_id) + WHEN a.originator_type = 5 THEN (select COALESCE(NULLIF(label, ''), name) from device where id = a.originator_id) WHEN a.originator_type = 9 THEN (select name from entity_view where id = a.originator_id) WHEN a.originator_type = 13 THEN (select name from device_profile where id = a.originator_id) WHEN a.originator_type = 14 THEN (select name from asset_profile where id = a.originator_id) - WHEN a.originator_type = 18 THEN (select COALESCE(label, name) from edge where id = a.originator_id) END + WHEN a.originator_type = 18 THEN (select COALESCE(NULLIF(label, ''), name) from edge where id = a.originator_id) END , 'Deleted') as originator_label, u.first_name as assignee_first_name, u.last_name as assignee_last_name, u.email as assignee_email FROM alarm a