diff --git a/packages/opencode/src/storage/db.ts b/packages/opencode/src/storage/db.ts index 4cb0dbc3e184..85088c1f504e 100644 --- a/packages/opencode/src/storage/db.ts +++ b/packages/opencode/src/storage/db.ts @@ -11,7 +11,6 @@ import z from "zod" import path from "path" import { readFileSync, readdirSync, existsSync } from "fs" import { Flag } from "../flag/flag" -import { CHANNEL } from "../installation/meta" import { InstanceState } from "@/effect/instance-state" import { iife } from "@/util/iife" import { init } from "#db" @@ -28,19 +27,12 @@ export const NotFoundError = NamedError.create( const log = Log.create({ service: "db" }) export namespace Database { - export function getChannelPath() { - if (["latest", "beta"].includes(CHANNEL) || Flag.OPENCODE_DISABLE_CHANNEL_DB) - return path.join(Global.Path.data, "opencode.db") - const safe = CHANNEL.replace(/[^a-zA-Z0-9._-]/g, "-") - return path.join(Global.Path.data, `opencode-${safe}.db`) - } - export const Path = iife(() => { if (Flag.OPENCODE_DB) { if (Flag.OPENCODE_DB === ":memory:" || path.isAbsolute(Flag.OPENCODE_DB)) return Flag.OPENCODE_DB return path.join(Global.Path.data, Flag.OPENCODE_DB) } - return getChannelPath() + return path.join(Global.Path.data, "opencode.db") }) export type Transaction = SQLiteTransaction<"sync", void> diff --git a/packages/opencode/test/storage/db.test.ts b/packages/opencode/test/storage/db.test.ts index f6b60555959f..5099d55438b7 100644 --- a/packages/opencode/test/storage/db.test.ts +++ b/packages/opencode/test/storage/db.test.ts @@ -1,14 +1,8 @@ import { describe, expect, test } from "bun:test" -import path from "path" -import { Global } from "../../src/global" -import { Installation } from "../../src/installation" import { Database } from "../../src/storage/db" describe("Database.Path", () => { - test("returns database path for the current channel", () => { - const expected = ["latest", "beta"].includes(Installation.CHANNEL) - ? path.join(Global.Path.data, "opencode.db") - : path.join(Global.Path.data, `opencode-${Installation.CHANNEL.replace(/[^a-zA-Z0-9._-]/g, "-")}.db`) - expect(Database.getChannelPath()).toBe(expected) + test("respects OPENCODE_DB env override", () => { + expect(Database.Path).toBe(":memory:") }) })