Merge branch 'main' into henrymercer/direct-tracing-fix

2026-01-03 21:20:09 +08:00 · 2024-06-12 13:21:01 +01:00
parent 94acfdc22c 81b81437fd
commit f2ea211cd9
7 changed files with 17 additions and 5 deletions
--- a/src/codeql.ts
+++ b/src/codeql.ts
@@ -612,12 +612,19 @@ export async function getCodeQLForCmd(
        extraArgs.push("--no-sublanguage-file-coverage");
      }

+      const overwriteFlag = isSupportedToolsFeature(
+        await this.getVersion(),
+        ToolsFeature.ForceOverwrite,
+      )
+        ? "--force-overwrite"
+        : "--overwrite";
+
      await runTool(
        cmd,
        [
          "database",
          "init",
-          "--overwrite",
+          overwriteFlag,
          "--db-cluster",
          config.dbLocation,
          `--source-root=${sourceRoot}`,