From e30c05b6a0f564118ea2b10c36a1b9ea5cc86913 Mon Sep 17 00:00:00 2001 From: John Clary Date: Thu, 19 Sep 2024 13:36:47 -0400 Subject: [PATCH 1/2] fix column order in units_cris_insert_rows() --- .../down.sql | 84 +++++++++++++++++++ .../up.sql | 83 ++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 database/migrations/default/1726766736889_patch-units_cris_insert_rows/down.sql create mode 100644 database/migrations/default/1726766736889_patch-units_cris_insert_rows/up.sql diff --git a/database/migrations/default/1726766736889_patch-units_cris_insert_rows/down.sql b/database/migrations/default/1726766736889_patch-units_cris_insert_rows/down.sql new file mode 100644 index 000000000..15538884f --- /dev/null +++ b/database/migrations/default/1726766736889_patch-units_cris_insert_rows/down.sql @@ -0,0 +1,84 @@ +--revert to migrations/default/1725990797742_veh_hnr_fl - which is bugged out! +CREATE OR REPLACE FUNCTION public.units_cris_insert_rows() + RETURNS trigger + LANGUAGE plpgsql +AS $function$ +BEGIN + -- insert new combined / official record + INSERT INTO public.units ( + autonomous_unit_id, + contrib_factr_1_id, + contrib_factr_2_id, + contrib_factr_3_id, + contrib_factr_p1_id, + contrib_factr_p2_id, + crash_pk, + created_by, + cris_crash_id, + e_scooter_id, + first_harm_evt_inv_id, + id, + is_deleted, + pbcat_pedalcyclist_id, + pbcat_pedestrian_id, + pedalcyclist_action_id, + pedestrian_action_id, + rpt_autonomous_level_engaged_id, + unit_desc_id, + unit_nbr, + updated_by, + veh_body_styl_id, + veh_damage_description1_id, + veh_damage_description2_id, + veh_damage_direction_of_force1_id, + veh_damage_direction_of_force2_id, + veh_damage_severity1_id, + veh_damage_severity2_id, + veh_hnr_fl, + veh_make_id, + veh_mod_id, + veh_mod_year, + veh_trvl_dir_id, + vin + ) values ( + new.autonomous_unit_id, + new.contrib_factr_1_id, + new.contrib_factr_2_id, + new.contrib_factr_3_id, + new.contrib_factr_p1_id, + new.contrib_factr_p2_id, + new.crash_pk, + new.created_by, + new.cris_crash_id, + new.e_scooter_id, + new.first_harm_evt_inv_id, + new.id, + new.is_deleted, + new.pbcat_pedalcyclist_id, + new.pbcat_pedestrian_id, + new.pedalcyclist_action_id, + new.pedestrian_action_id, + new.rpt_autonomous_level_engaged_id, + new.unit_desc_id, + new.unit_nbr, + new.updated_by, + new.veh_body_styl_id, + new.veh_damage_description1_id, + new.veh_damage_description2_id, + new.veh_damage_direction_of_force1_id, + new.veh_damage_direction_of_force2_id, + new.veh_damage_severity1_id, + new.veh_damage_severity2_id, + new.veh_hnr_fl, + new.veh_make_id, + new.veh_mod_id, + new.veh_mod_year, + new.veh_trvl_dir_id, + new.vin + ); + -- insert new (editable) vz record (only record ID) + INSERT INTO public.units_edits (id) values (new.id); + + RETURN NULL; +END; +$function$; diff --git a/database/migrations/default/1726766736889_patch-units_cris_insert_rows/up.sql b/database/migrations/default/1726766736889_patch-units_cris_insert_rows/up.sql new file mode 100644 index 000000000..4e10488a3 --- /dev/null +++ b/database/migrations/default/1726766736889_patch-units_cris_insert_rows/up.sql @@ -0,0 +1,83 @@ +CREATE OR REPLACE FUNCTION public.units_cris_insert_rows() + RETURNS trigger + LANGUAGE plpgsql +AS $function$ +BEGIN + -- insert new combined / official record + INSERT INTO public.units ( + autonomous_unit_id, + contrib_factr_1_id, + contrib_factr_2_id, + contrib_factr_3_id, + contrib_factr_p1_id, + contrib_factr_p2_id, + crash_pk, + created_by, + cris_crash_id, + e_scooter_id, + first_harm_evt_inv_id, + id, + is_deleted, + pbcat_pedalcyclist_id, + pbcat_pedestrian_id, + pedalcyclist_action_id, + pedestrian_action_id, + rpt_autonomous_level_engaged_id, + unit_desc_id, + unit_nbr, + updated_by, + veh_body_styl_id, + veh_damage_description1_id, + veh_damage_description2_id, + veh_damage_direction_of_force1_id, + veh_damage_direction_of_force2_id, + veh_damage_severity1_id, + veh_damage_severity2_id, + veh_hnr_fl, + veh_make_id, + veh_mod_id, + veh_mod_year, + veh_trvl_dir_id, + vin + ) values ( + new.autonomous_unit_id, + new.contrib_factr_1_id, + new.contrib_factr_2_id, + new.contrib_factr_3_id, + new.contrib_factr_p1_id, + new.contrib_factr_p2_id, + new.crash_pk, + new.created_by, + new.cris_crash_id, + new.e_scooter_id, + new.first_harm_evt_inv_id, + new.id, + new.is_deleted, + new.pbcat_pedalcyclist_id, + new.pbcat_pedestrian_id, + new.pedalcyclist_action_id, + new.pedestrian_action_id, + new.rpt_autonomous_level_engaged_id, + new.unit_desc_id, + new.unit_nbr, + new.updated_by, + new.veh_body_styl_id, + new.veh_damage_description1_id, + new.veh_damage_description2_id, + new.veh_damage_direction_of_force1_id, + new.veh_damage_direction_of_force2_id, + new.veh_damage_severity1_id, + new.veh_damage_severity2_id, + new.veh_hnr_fl, + new.veh_make_id, + new.veh_mod_id, + new.veh_mod_year, + new.veh_trvl_dir_id, + new.vin + ); + -- insert new (editable) vz record (only record ID) + INSERT INTO public.units_edits (id) values (new.id); + + RETURN NULL; +END; +$function$; From 9e3687d79d1d78bd4342658c6a84d18688117d51 Mon Sep 17 00:00:00 2001 From: John Clary Date: Thu, 19 Sep 2024 13:42:59 -0400 Subject: [PATCH 2/2] add correct down migra --- .../1726766736889_patch-units_cris_insert_rows/down.sql | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/database/migrations/default/1726766736889_patch-units_cris_insert_rows/down.sql b/database/migrations/default/1726766736889_patch-units_cris_insert_rows/down.sql index 15538884f..4b7eccf78 100644 --- a/database/migrations/default/1726766736889_patch-units_cris_insert_rows/down.sql +++ b/database/migrations/default/1726766736889_patch-units_cris_insert_rows/down.sql @@ -69,16 +69,10 @@ BEGIN new.veh_damage_direction_of_force2_id, new.veh_damage_severity1_id, new.veh_damage_severity2_id, - new.veh_hnr_fl, new.veh_make_id, + new.veh_hnr_fl, new.veh_mod_id, new.veh_mod_year, new.veh_trvl_dir_id, new.vin ); - -- insert new (editable) vz record (only record ID) - INSERT INTO public.units_edits (id) values (new.id); - - RETURN NULL; -END; -$function$;