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

Fix soem tests and added upgrade script

Browse Source
This commit is contained in:
Andrii Shvaika 2023-02-24 14:58:13 +02:00
parent 38b2cf41c4
commit c4a64a98d3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/data/upgrade/3.4.4/schema_update.sql
View File

@ -124,6 +124,7 @@ LEFT JOIN tb_user u ON u.id = a.assignee_id;
-- ALARM FUNCTIONS START -- ALARM FUNCTIONS START
DROP FUNCTION IF EXISTS create_or_update_active_alarm;
CREATE OR REPLACE FUNCTION create_or_update_active_alarm( CREATE OR REPLACE FUNCTION create_or_update_active_alarm(
t_id uuid, c_id uuid, a_id uuid, a_created_ts bigint, t_id uuid, c_id uuid, a_id uuid, a_created_ts bigint,
a_o_id uuid, a_o_type integer, a_type varchar, a_o_id uuid, a_o_type integer, a_type varchar,
@ -142,8 +143,8 @@ DECLARE
result alarm_info; result alarm_info;
row_count integer; row_count integer;
BEGIN BEGIN
SELECT * INTO existing FROM alarm a WHERE a.originator_id = a_o_id AND a.type = a_type ORDER BY a.start_ts DESC FOR UPDATE; SELECT * INTO existing FROM alarm a WHERE a.originator_id = a_o_id AND a.type = a_type AND a.cleared = false ORDER BY a.start_ts DESC FOR UPDATE;
IF existing.id IS NULL OR existing.cleared IS TRUE THEN IF existing.id IS NULL THEN
IF a_creation_enabled = FALSE THEN IF a_creation_enabled = FALSE THEN
RETURN json_build_object('success', false)::text; RETURN json_build_object('success', false)::text;
END IF; END IF;