Skip to content

Commit ff579db

Browse files
committed
Include vuln_related table in merge command
Signed-off-by: nscuro <nscuro@protonmail.com>
1 parent 5e2fc24 commit ff579db

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

src/main/java/org/dependencytrack/vulndb/cli/MergeCommand.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,25 @@ on conflict(source_name, vuln_id, alias_id) do update
9191
or excluded.deleted_at is distinct from main.vuln_alias.deleted_at
9292
""");
9393

94+
LOGGER.info("Merging vuln_related tables");
95+
handle.execute("""
96+
insert into main.vuln_related(
97+
source_name
98+
, vuln_id
99+
, related_id
100+
, created_at
101+
, deleted_at
102+
)
103+
select *
104+
from other.vuln_related
105+
where 1 = 1
106+
on conflict(source_name, vuln_id, related_id) do update
107+
set created_at = excluded.created_at
108+
, deleted_at = excluded.deleted_at
109+
where excluded.created_at > main.vuln_related.created_at
110+
or excluded.deleted_at is distinct from main.vuln_related.deleted_at
111+
""");
112+
94113
LOGGER.info("Merging vuln_data tables");
95114
handle.execute("""
96115
insert into main.vuln_data(

0 commit comments

Comments
 (0)