From 9494d32144e4f225e103941bc9a46dea8fad2e61 Mon Sep 17 00:00:00 2001
From: Kasper Svendsen <kaspersv@github.com>
Date: Tue, 11 Jun 2024 10:55:42 +0000
Subject: [PATCH 1/2] Clear query server package cache on dbscheme edits

---
 extensions/ql-vscode/src/extension.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
index 2b67b374d..6a2a922c3 100644
--- a/extensions/ql-vscode/src/extension.ts
+++ b/extensions/ql-vscode/src/extension.ts
@@ -717,12 +717,13 @@ async function installOrUpdateThenTryActivate(
   return undefined;
 }
 
-const PACK_GLOBS = [
+const CLEAR_PACK_CACHE_ON_EDIT_GLOBS = [
   "**/codeql-pack.yml",
   "**/qlpack.yml",
   "**/queries.xml",
   "**/codeql-pack.lock.yml",
   "**/qlpack.lock.yml",
+  "**/*.dbscheme",
   ".codeqlmanifest.json",
   "codeql-workspace.yml",
 ];
@@ -769,7 +770,7 @@ async function activateWithInstalledDistribution(
     ctx,
   );
 
-  for (const glob of PACK_GLOBS) {
+  for (const glob of CLEAR_PACK_CACHE_ON_EDIT_GLOBS) {
     const fsWatcher = workspace.createFileSystemWatcher(glob);
     ctx.subscriptions.push(fsWatcher);
 

From 10f4b470199f8344a5a1b95aecf2949d6df8f4a5 Mon Sep 17 00:00:00 2001
From: Robert <robertbrignull@github.com>
Date: Thu, 13 Jun 2024 11:03:37 +0000
Subject: [PATCH 2/2] Remove short-paths.test.ts

---
 .../unit-tests/common/short-paths.test.ts     | 96 -------------------
 1 file changed, 96 deletions(-)
 delete mode 100644 extensions/ql-vscode/test/unit-tests/common/short-paths.test.ts

diff --git a/extensions/ql-vscode/test/unit-tests/common/short-paths.test.ts b/extensions/ql-vscode/test/unit-tests/common/short-paths.test.ts
deleted file mode 100644
index 7d379c38d..000000000
--- a/extensions/ql-vscode/test/unit-tests/common/short-paths.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { platform } from "os";
-import type { BaseLogger } from "../../../src/common/logging";
-import { expandShortPaths } from "../../../src/common/short-paths";
-import { join } from "path";
-
-describe("expandShortPaths", () => {
-  let logger: BaseLogger;
-
-  beforeEach(() => {
-    logger = {
-      log: jest.fn(),
-    };
-  });
-
-  describe("on POSIX", () => {
-    if (platform() === "win32") {
-      console.log(`Skipping test on Windows`);
-      return;
-    }
-
-    it("should return the same path for non-Windows platforms", async () => {
-      const path = "/home/user/some~path";
-      const result = await expandShortPaths(path, logger);
-
-      expect(logger.log).not.toHaveBeenCalled();
-      expect(result).toBe(path);
-    });
-  });
-
-  describe("on Windows", () => {
-    if (platform() !== "win32") {
-      console.log(`Skipping test on non-Windows`);
-      return;
-    }
-
-    it("should return the same path if no short components", async () => {
-      const path = "C:\\Program Files\\Some Folder";
-      const result = await expandShortPaths(path, logger);
-
-      expect(logger.log).toHaveBeenCalledWith(
-        `Expanding short paths in: ${path}`,
-      );
-      expect(logger.log).toHaveBeenCalledWith(
-        "Skipping due to no short components",
-      );
-      expect(result).toBe(path);
-    });
-
-    it("should not attempt to expand long paths with '~' in the name", async () => {
-      const testDir = join(__dirname, "../data/short-paths");
-      const path = join(testDir, "textfile-with~tilde.txt");
-      const result = await expandShortPaths(path, logger);
-
-      expect(logger.log).toHaveBeenCalledWith(
-        `Expanding short paths in: ${path}`,
-      );
-      expect(logger.log).toHaveBeenCalledWith(
-        `Expanding short path component: textfile-with~tilde.txt`,
-      );
-      expect(logger.log).toHaveBeenCalledWith(`Component is not a short name`);
-      expect(result).toBe(join(testDir, "textfile-with~tilde.txt"));
-    });
-
-    it("should expand a short path", async () => {
-      const path = "C:\\PROGRA~1\\Some Folder";
-      const result = await expandShortPaths(path, logger);
-
-      expect(logger.log).toHaveBeenCalledWith(
-        `Expanding short paths in: ${path}`,
-      );
-      expect(logger.log).toHaveBeenCalledWith(
-        `Expanding short path component: PROGRA~1`,
-      );
-      expect(result).toBe("C:\\Program Files\\Some Folder");
-    });
-
-    it("should expand multiple short paths", async () => {
-      const testDir = join(__dirname, "../data/short-paths");
-      const path = join(testDir, "FOLDER~1", "TEXTFI~1.TXT");
-      const result = await expandShortPaths(path, logger);
-
-      expect(logger.log).toHaveBeenCalledWith(
-        `Expanding short paths in: ${path}`,
-      );
-      expect(logger.log).toHaveBeenCalledWith(
-        `Expanding short path component: FOLDER~1`,
-      );
-      expect(logger.log).toHaveBeenCalledWith(
-        `Expanding short path component: TEXTFI~1.TXT`,
-      );
-      expect(result).toBe(
-        join(testDir, "folder with space", ".textfile+extra.characters.txt"),
-      );
-    });
-  });
-});