Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix when there are additional suites and custom queries
Robert Brignull committed Jun 1, 2020

Unverified

No user is associated with the committer email.
1 parent d7a2025 commit 655c449
Showing 3 changed files with 14 additions and 5 deletions.
8 changes: 6 additions & 2 deletions lib/finalize-db.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/finalize-db.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions 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;

0 comments on commit 655c449

Please sign in to comment.