Fix rebase conflict changes

Author: norascheuch

extensions/ql-vscode/src/databases/db-module.ts

@@ -22,7 +22,8 @@ export class DbModule extends DisposableObject {
     void logger.log('Initializing database module');
 
     const storagePath = extensionContext.storageUri?.fsPath || extensionContext.globalStorageUri.fsPath;
-    const dbConfigStore = new DbConfigStore(storagePath);
+    const extensionPath = extensionContext.extensionPath;
+    const dbConfigStore = new DbConfigStore(storagePath, extensionPath);
     await dbConfigStore.initialize();
 
     const dbManager = new DbManager(dbConfigStore);

extensions/ql-vscode/test/pure-tests/databases/data/workspace-databases-schema.json

@@ -42,10 +42,8 @@
           }
         }
       },
-      "required": ["repositoryList", "owners", "repositories"],
+      "required": ["repositoryLists", "owners", "repositories"],
       "additionalProperties": false
     }
-  },
-  "required": ["repositoryLists", "owners", "repositories"],
-  "additionalProperties": false
+  }
 }

extensions/ql-vscode/test/pure-tests/databases/data/workspace-databases.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "file:workspace-databases-schema.json",
+  "$schema": "workspace-databases-schema.json",
   "remote": {
     "repositoryLists": [
       {

extensions/ql-vscode/workspace-databases-schema.json

@@ -42,10 +42,8 @@
           }
         }
       },
-      "required": ["repositoryList", "owners", "repositories"],
+      "required": ["repositoryLists", "owners", "repositories"],
       "additionalProperties": false
     }
-  },
-  "required": ["repositoryLists", "owners", "repositories"],
-  "additionalProperties": false
+  }
 }