Skip to content

Commit d79d0f3

Browse files
committed
Add on conflict to prevent error
1 parent 5c9a9a3 commit d79d0f3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

updates/36/36010/utils/dml.sql

+4-4
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,10 @@ UPDATE config_form_fields SET linkedobject='tbl_event_x_arc' WHERE formname='arc
258258
UPDATE config_form_fields SET linkedobject='tbl_event_x_connec' WHERE formname='connec' AND formtype='form_feature' AND tabname='tab_event' AND linkedobject = 'tbl_visit_x_connec';
259259
UPDATE config_form_fields SET linkedobject='tbl_event_x_node' WHERE formname='node' AND formtype='form_feature' AND tabname='tab_event' AND linkedobject = 'tbl_visit_x_node';
260260

261-
INSERT INTO config_form_list (listname, query_text, device, listtype, listclass, vdefault, addparam) VALUES('v_ui_visit_arc_leak', 'SELECT * FROM v_ui_visit_arc_leak WHERE visit_id IS NOT NULL', 4, 'tab', 'list', '{"orderBy":"1", "orderType": "ASC"}'::json, NULL);
262-
INSERT INTO config_form_list (listname, query_text, device, listtype, listclass, vdefault, addparam) VALUES('v_ui_visit_connec_leak', 'SELECT * FROM v_ui_visit_connec_leak WHERE visit_id IS NOT NULL', 4, 'tab', 'list', '{"orderBy":"1", "orderType": "ASC"}'::json, NULL);
263-
INSERT INTO config_form_list (listname, query_text, device, listtype, listclass, vdefault, addparam) VALUES('v_ui_visit_node_insp', 'SELECT * FROM v_ui_visit_node_insp WHERE visit_id IS NOT NULL', 4, 'tab', 'list', '{"orderBy":"1", "orderType": "ASC"}'::json, NULL);
264-
INSERT INTO config_form_list (listname, query_text, device, listtype, listclass, vdefault, addparam) VALUES('v_ui_visit_incid_node', 'SELECT * FROM v_ui_visit_incid_node WHERE visit_id IS NOT NULL', 4, 'tab', 'list', '{"orderBy":"1", "orderType": "ASC"}'::json, NULL);
261+
INSERT INTO config_form_list (listname, query_text, device, listtype, listclass, vdefault, addparam) VALUES('v_ui_visit_arc_leak', 'SELECT * FROM v_ui_visit_arc_leak WHERE visit_id IS NOT NULL', 4, 'tab', 'list', '{"orderBy":"1", "orderType": "ASC"}'::json, NULL) ON CONFLICT (listname, device) DO NOTHING;
262+
INSERT INTO config_form_list (listname, query_text, device, listtype, listclass, vdefault, addparam) VALUES('v_ui_visit_connec_leak', 'SELECT * FROM v_ui_visit_connec_leak WHERE visit_id IS NOT NULL', 4, 'tab', 'list', '{"orderBy":"1", "orderType": "ASC"}'::json, NULL) ON CONFLICT (listname, device) DO NOTHING;
263+
INSERT INTO config_form_list (listname, query_text, device, listtype, listclass, vdefault, addparam) VALUES('v_ui_visit_node_insp', 'SELECT * FROM v_ui_visit_node_insp WHERE visit_id IS NOT NULL', 4, 'tab', 'list', '{"orderBy":"1", "orderType": "ASC"}'::json, NULL) ON CONFLICT (listname, device) DO NOTHING;
264+
INSERT INTO config_form_list (listname, query_text, device, listtype, listclass, vdefault, addparam) VALUES('v_ui_visit_incid_node', 'SELECT * FROM v_ui_visit_incid_node WHERE visit_id IS NOT NULL', 4, 'tab', 'list', '{"orderBy":"1", "orderType": "ASC"}'::json, NULL) ON CONFLICT (listname, device) DO NOTHING;
265265

266266
UPDATE config_form_fields SET dv_querytext='SELECT id, idval FROM config_visit_class WHERE feature_type IN (''ARC'',''ALL'') ', isfilter=false, dv_isnullvalue=false, widgetfunction='{"functionName": "manage_visit_class","parameters": {}}'::json WHERE formname='arc' AND formtype='form_feature' AND columnname='visit_class' AND tabname='tab_visit';
267267
UPDATE config_form_fields SET linkedobject=NULL WHERE formname='arc' AND formtype='form_feature' AND columnname='tbl_visits' AND tabname='tab_visit';

updates/36/36011/ud/dml.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ where parameter = 'om_profile_guitartext';
1515
UPDATE sys_table SET addparam='{"pkey":"hydrology_id"}'::json WHERE id='v_edit_cat_hydrology';
1616

1717
-- 02/07/2024
18-
INSERT INTO config_form_fields (formname, formtype, tabname, columnname, layoutname, layoutorder, "datatype", widgettype, "label", tooltip, placeholder, ismandatory, isparent, iseditable, isautoupdate, isfilter, dv_querytext, dv_orderby_id, dv_isnullvalue, dv_parent_id, dv_querytext_filterc, stylesheet, widgetcontrols, widgetfunction, linkedobject, hidden, web_layoutorder) VALUES('ve_connec_connec', 'form_feature', 'tab_data', 'plot_code', 'lyt_data_2', 44, 'string', 'text', 'plot_code', 'plot_code', NULL, false, false, true, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL);
19-
INSERT INTO config_form_fields (formname, formtype, tabname, columnname, layoutname, layoutorder, "datatype", widgettype, "label", tooltip, placeholder, ismandatory, isparent, iseditable, isautoupdate, isfilter, dv_querytext, dv_orderby_id, dv_isnullvalue, dv_parent_id, dv_querytext_filterc, stylesheet, widgetcontrols, widgetfunction, linkedobject, hidden, web_layoutorder) VALUES('ve_connec_vconnec', 'form_feature', 'tab_data', 'plot_code', 'lyt_data_2', 44, 'string', 'text', 'plot_code', 'plot_code', NULL, false, false, true, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL);
18+
INSERT INTO config_form_fields (formname, formtype, tabname, columnname, layoutname, layoutorder, "datatype", widgettype, "label", tooltip, placeholder, ismandatory, isparent, iseditable, isautoupdate, isfilter, dv_querytext, dv_orderby_id, dv_isnullvalue, dv_parent_id, dv_querytext_filterc, stylesheet, widgetcontrols, widgetfunction, linkedobject, hidden, web_layoutorder) VALUES('ve_connec_connec', 'form_feature', 'tab_data', 'plot_code', 'lyt_data_2', 44, 'string', 'text', 'plot_code', 'plot_code', NULL, false, false, true, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL) ON CONFLICT (formname, formtype, columnname, tabname) DO NOTHING;
19+
INSERT INTO config_form_fields (formname, formtype, tabname, columnname, layoutname, layoutorder, "datatype", widgettype, "label", tooltip, placeholder, ismandatory, isparent, iseditable, isautoupdate, isfilter, dv_querytext, dv_orderby_id, dv_isnullvalue, dv_parent_id, dv_querytext_filterc, stylesheet, widgetcontrols, widgetfunction, linkedobject, hidden, web_layoutorder) VALUES('ve_connec_vconnec', 'form_feature', 'tab_data', 'plot_code', 'lyt_data_2', 44, 'string', 'text', 'plot_code', 'plot_code', NULL, false, false, true, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL) ON CONFLICT (formname, formtype, columnname, tabname) DO NOTHING;
2020

2121
-- 05/07/2024
2222
UPDATE sys_param_user SET "label"='End date' WHERE id='inp_options_end_date';

0 commit comments

Comments
 (0)