Add missing call to getPrimaryDbscheme in qlpackOfDatabase

hvitved · aeisenberg · commit 2516a624693f · 2020-12-14T10:20:28.000-08:00
diff --git a/extensions/ql-vscode/src/contextual/queryResolver.ts b/extensions/ql-vscode/src/contextual/queryResolver.ts
@@ -16,7 +16,8 @@ export async function qlpackOfDatabase(cli: CodeQLCliServer, db: DatabaseItem):
   if (db.contents === undefined)
     return undefined;
   const datasetPath = db.contents.datasetUri.fsPath;
-  return await helpers.getQlPackForDbscheme(cli, datasetPath);
+  const dbscheme = await helpers.getPrimaryDbscheme(datasetPath);
+  return await helpers.getQlPackForDbscheme(cli, dbscheme);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ export async function qlpackOfDatabase(cli: CodeQLCliServer, db: DatabaseItem):`
`16`	`16`	`if (db.contents === undefined)`
`17`	`17`	`return undefined;`
`18`	`18`	`const datasetPath = db.contents.datasetUri.fsPath;`
`19`		`- return await helpers.getQlPackForDbscheme(cli, datasetPath);`
	`19`	`+ const dbscheme = await helpers.getPrimaryDbscheme(datasetPath);`
	`20`	`+ return await helpers.getQlPackForDbscheme(cli, dbscheme);`
`20`	`21`	`}`
`21`	`22`
`22`	`23`