From 49b056a4bdccb9237117bb6f681ce7ac51336906 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 9 Oct 2023 11:20:48 -0500 Subject: [PATCH] Experiment: try switching to deno-sqlite3 --- deno.json | 6 +++--- src/db.ts | 6 +++--- src/deps.ts | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/deno.json b/deno.json index 52bccbed..0524f6d8 100644 --- a/deno.json +++ b/deno.json @@ -2,9 +2,9 @@ "$schema": "https://deno.land/x/deno@v1.32.3/cli/schemas/config-file.v1.json", "lock": false, "tasks": { - "start": "deno run --allow-read --allow-write=data --allow-env --allow-net --allow-sys src/server.ts", - "dev": "deno run --allow-read --allow-write=data --allow-env --allow-net --allow-sys --watch src/server.ts", - "debug": "deno run --allow-read --allow-write=data --allow-env --allow-net --allow-sys --inspect src/server.ts", + "start": "deno run -A --unstable src/server.ts", + "dev": "deno run -A --unstable --watch src/server.ts", + "debug": "deno run -A --unstable --inspect src/server.ts", "test": "DB_PATH=\":memory:\" deno test --allow-read --allow-write=data --allow-env src", "check": "deno check src/server.ts", "relays:sync": "deno run -A scripts/relays.ts sync" diff --git a/src/db.ts b/src/db.ts index abbe9825..a1364ad3 100644 --- a/src/db.ts +++ b/src/db.ts @@ -1,7 +1,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; -import { DenoSqliteDialect, FileMigrationProvider, Kysely, Migrator, Sqlite } from '@/deps.ts'; +import { DenoSqlite3Dialect, FileMigrationProvider, Kysely, Migrator, Sqlite, DenoSqlite3 } from '@/deps.ts'; import { Conf } from '@/config.ts'; interface DittoDB { @@ -56,8 +56,8 @@ interface UnattachedMediaRow { } const db = new Kysely({ - dialect: new DenoSqliteDialect({ - database: new Sqlite(Conf.dbPath), + dialect: new DenoSqlite3Dialect({ + database: new DenoSqlite3(Conf.dbPath), }), }); diff --git a/src/deps.ts b/src/deps.ts index 7694d30c..100ce3f2 100644 --- a/src/deps.ts +++ b/src/deps.ts @@ -75,4 +75,7 @@ export { Machina } from 'https://gitlab.com/soapbox-pub/nostr-machina/-/raw/08a1 export * as Sentry from 'npm:@sentry/node@^7.73.0'; export { sentry as sentryMiddleware } from 'npm:@hono/sentry@^1.0.0'; +export { Database as DenoSqlite3 } from 'https://deno.land/x/sqlite3@0.9.1/mod.ts'; +export { DenoSqlite3Dialect } from 'https://gitlab.com/soapbox-pub/kysely-deno-sqlite/-/raw/820e58295b70a18086622f25fc3572887d3d4c1b/mod.ts'; + export type * as TypeFest from 'npm:type-fest@^4.3.0';