Add LocalQueryInfo.databaseName getter

Author: robertbrignull

extensions/ql-vscode/src/query-history/history-item-label-provider.ts

@@ -80,7 +80,7 @@ export class HistoryItemLabelProvider {
     return {
       t: item.startTime,
       q: item.getQueryName(),
-      d: item.initialInfo.databaseInfo.name,
+      d: item.databaseName,
       r: `(${resultCount} results)`,
       s: statusString,
       f: item.getQueryFileName(),

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -1084,7 +1084,7 @@ export class QueryHistoryManager extends DisposableObject {
     fromItem: CompletedLocalQueryInfo,
     allSelectedItems: CompletedLocalQueryInfo[],
   ): Promise<CompletedLocalQueryInfo | undefined> {
-    const dbName = fromItem.initialInfo.databaseInfo.name;
+    const dbName = fromItem.databaseName;
 
     // If exactly 2 items are selected, return the one that
     // isn't being used as the "from" item.
@@ -1093,7 +1093,7 @@ export class QueryHistoryManager extends DisposableObject {
         fromItem === allSelectedItems[0]
           ? allSelectedItems[1]
           : allSelectedItems[0];
-      if (otherItem.initialInfo.databaseInfo.name !== dbName) {
+      if (otherItem.databaseName !== dbName) {
         throw new Error("Query databases must be the same.");
       }
       return otherItem;
@@ -1108,12 +1108,11 @@ export class QueryHistoryManager extends DisposableObject {
       .filter(this.isSuccessfulCompletedLocalQueryInfo)
       .filter(
         (otherItem) =>
-          otherItem !== fromItem &&
-          otherItem.initialInfo.databaseInfo.name === dbName,
+          otherItem !== fromItem && otherItem.databaseName === dbName,
       )
       .map((item) => ({
         label: this.labelProvider.getLabel(item),
-        description: item.initialInfo.databaseInfo.name,
+        description: item.databaseName,
         detail: item.completedQuery.statusString,
         query: item,
       }));

extensions/ql-vscode/src/query-results.ts

@@ -313,4 +313,8 @@ export class LocalQueryInfo {
       return QueryStatus.Failed;
     }
   }
+
+  get databaseName() {
+    return this.initialInfo.databaseInfo.name;
+  }
 }