Rename global "databases" setting

Author: shati-patel

extensions/ql-vscode/CHANGELOG.md

@@ -7,6 +7,10 @@
 ## 1.9.4 - 6 November 2023
 
 No user facing changes.
+- When downloading a database, we no longer add the database source folder to the workspace by default (since this caused bugs in single-folder workspaces). [#3047](https://github.com/github/vscode-codeql/pull/3047)
+- When adding a CodeQL database, we no longer add the database source folder to the workspace by default (since this caused bugs in single-folder workspaces). [#3047](https://github.com/github/vscode-codeql/pull/3047)
+  - You can manually add individual database source folders to the workspace with the "Add Database Source to Workspace" right-click command in the databases view.
+  - To restore the old behavior of adding all database source folders by default, set the `codeQL.addingDatabases.addDatabaseSourceToWorkspace` setting to `true`.
 
 ## 1.9.3 - 26 October 2023
 

extensions/ql-vscode/package.json

@@ -372,18 +372,18 @@
       },
       {
         "type": "object",
-        "title": "Downloading databases",
+        "title": "Adding databases",
         "order": 6,
         "properties": {
-          "codeQL.databaseDownload.allowHttp": {
+          "codeQL.addingDatabases.allowHttp": {
             "type": "boolean",
             "default": false,
             "description": "Allow databases to be downloaded via HTTP. Warning: enabling this option will allow downloading from insecure servers."
           },
-          "codeQL.databaseDownload.addDatabaseSourceToWorkspace": {
+          "codeQL.addingDatabases.addDatabaseSourceToWorkspace": {
             "type": "boolean",
             "default": false,
-            "markdownDescription": "When downloading a database, automatically add the database's source folder as a workspace folder. Warning: enabling this option in a single-folder workspace will cause the workspace to reload as a [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces). This may cause query history and database lists to be reset."
+            "markdownDescription": "When adding a CodeQL database, automatically add the database's source folder as a workspace folder. Warning: enabling this option in a single-folder workspace will cause the workspace to reload as a [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces). This may cause query history and database lists to be reset."
           }
         }
       },

extensions/ql-vscode/src/config.ts

@@ -641,7 +641,7 @@ export function isCodespacesTemplate() {
   return !!CODESPACES_TEMPLATE.getValue<boolean>();
 }
 
-const DATABASE_DOWNLOAD_SETTING = new Setting("databaseDownload", ROOT_SETTING);
+const DATABASE_DOWNLOAD_SETTING = new Setting("addingDatabases", ROOT_SETTING);
 
 const ALLOW_HTTP_SETTING = new Setting("allowHttp", DATABASE_DOWNLOAD_SETTING);
 

extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-queries/local-databases.test.ts

@@ -729,15 +729,15 @@ describe("local databases", () => {
       expect(setCurrentDatabaseItemSpy).toBeCalledTimes(1);
     });
 
-    it("should not add database source archive folder when `codeQL.databaseDownload.addDatabaseSourceToWorkspace` is `false`", async () => {
+    it("should not add database source archive folder when `codeQL.addingDatabases.addDatabaseSourceToWorkspace` is `false`", async () => {
       jest.spyOn(config, "addDatabaseSourceToWorkspace").mockReturnValue(false);
 
       await databaseManager.openDatabase(mockDbItem.databaseUri);
 
       expect(addDatabaseSourceArchiveFolderSpy).toBeCalledTimes(0);
     });
 
-    it("should add database source archive folder when `codeQL.databaseDownload.addDatabaseSourceToWorkspace` is `true`", async () => {
+    it("should add database source archive folder when `codeQL.addingDatabases.addDatabaseSourceToWorkspace` is `true`", async () => {
       jest.spyOn(config, "addDatabaseSourceToWorkspace").mockReturnValue(true);
 
       await databaseManager.openDatabase(mockDbItem.databaseUri);