diff --git a/.env.example b/.env.example index 50855de..c549f70 100644 --- a/.env.example +++ b/.env.example @@ -4,7 +4,7 @@ AUTHORIZED_USERS="" # PDS service URL (optional) SERVICE="https://bsky.social" -DB_PATH="data/sqlite.db" +DB_PATH="sqlite.db" GEMINI_MODEL="gemini-2.5-flash" DID="" diff --git a/.gitignore b/.gitignore index d3cb348..7a56ead 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,4 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json .DS_Store # Database -data \ No newline at end of file +*.db \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index d955d34..84827b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,12 +6,11 @@ services: environment: - "AUTHORIZED_USERS=${AUTHORIZED_USERS}" - "SERVICE=${SERVICE:?https://bsky.social}" - - "DB_PATH=data/sqlite.db" + - "DB_PATH=sqlite.db" - "GEMINI_MODEL=${GEMINI_MODEL:-gemini-2.5-flash}" - "DID=${DID:?}" - "HANDLE=${HANDLE:?}" - "BSKY_PASSWORD=${BSKY_PASSWORD:?}" - "GEMINI_API_KEY=${GEMINI_API_KEY:?}" volumes: - - .:/app - - aero_db:/app/data + - aero_db:/sqlite.db diff --git a/src/db/index.ts b/src/db/index.ts index 88def3e..6643ac8 100644 --- a/src/db/index.ts +++ b/src/db/index.ts @@ -1,10 +1,12 @@ import { drizzle } from "drizzle-orm/bun-sqlite"; +import { migrate } from "drizzle-orm/bun-sqlite/migrator"; import { Database } from "bun:sqlite"; import * as schema from "./schema"; import { env } from "../env"; -import { migrateDB } from "./migrate"; - -await migrateDB(); const sqlite = new Database(env.DB_PATH); -export default drizzle(sqlite, { schema }); +const db = drizzle(sqlite, { schema }); + +migrate(db, { migrationsFolder: "./drizzle" }); + +export default db; diff --git a/src/db/migrate.ts b/src/db/migrate.ts deleted file mode 100644 index 0955709..0000000 --- a/src/db/migrate.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { migrate } from "drizzle-orm/bun-sqlite/migrator"; -import { drizzle } from "drizzle-orm/bun-sqlite"; -import { Database } from "bun:sqlite"; -import { env } from "../env"; - -export async function migrateDB() { - const sqlite = new Database(env.DB_PATH); - const db = drizzle(sqlite); - await migrate(db, { migrationsFolder: "./drizzle" }); -}