Commit 912672cb authored by Jan Kiene's avatar Jan Kiene
Browse files

only merge on merge_keys present in both tables

parent 91b20f49

ci/basop-pages/create_report_pages.py

+5 −1
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys): 
        for key in other_keys:

            new_row[f"{key}-{suffix1}"] = row1[key]



        found_merge_key_in_both_tbls = False

        for row2 in tbl2:

            if row1[merge_key] == row2[merge_key]:

                new_row[merge_key] = row1[merge_key]
@@ -303,8 +304,11 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys): 
                        new_row[f"{key}-{suffix2}"] = row2[key]

                    else:

                        new_row[f"{key}-{suffix2}"] = ""



                found_merge_key_in_both_tbls = True

                break



        if found_merge_key_in_both_tbls:

            merged.append(new_row)



    return merged