fix when there are additional suites and custom queries

github · Jun 1, 2020 · 655c449 · 655c449
1 parent d7a2025
commit 655c449
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/lib/finalize-db.js b/lib/finalize-db.js
diff --git a/lib/finalize-db.js.map b/lib/finalize-db.js.map
diff --git a/src/finalize-db.ts b/src/finalize-db.ts
@@ -108,6 +108,11 @@ async function runResolveQueries(codeqlCmd: string, queries: string[]): Promise<
 async function resolveQueryLanguages(codeqlCmd: string, config: configUtils.Config): Promise<Map<string, string[]>> {
   let res = new Map();
 
+  const languages = await util.getLanguages();
+  for (const language of languages) {
+    res[language] = [];
+  }
+
   if (config.additionalSuites.length !== 0) {
     const suites: string[] = [];
     for (const language of await util.getLanguages()) {
@@ -119,15 +124,15 @@ async function resolveQueryLanguages(codeqlCmd: string, config: configUtils.Conf
     const resolveQueriesOutputObject = await runResolveQueries(codeqlCmd, suites);
 
     for (const [language, queries] of Object.entries(resolveQueriesOutputObject.byLanguage)) {
-      res[language] = Object.keys(<any>queries);
+      res[language].push(...Object.keys(<any>queries));
     }
   }
 
   if (config.additionalQueries.length !== 0) {
     const resolveQueriesOutputObject = await runResolveQueries(codeqlCmd, config.additionalQueries);
 
     for (const [language, queries] of Object.entries(resolveQueriesOutputObject.byLanguage)) {
-      res[language] = Object.keys(<any>queries);
+      res[language].push(...Object.keys(<any>queries));
     }
 
     const noDeclaredLanguage = resolveQueriesOutputObject.noDeclaredLanguage;