Upgrade zendb to v11

Author: etienne-dldc

deno.json

@@ -7,8 +7,8 @@
   ],
   "imports": {
     "@db/sqlite": "jsr:@db/sqlite@^0.12.0",
-    "@dldc/zendb": "jsr:@dldc/zendb@^10.0.0",
-    "@std/expect": "jsr:@std/expect@^1.0.13"
+    "@dldc/zendb": "jsr:@dldc/zendb@^11.0.0",
+    "@std/expect": "jsr:@std/expect@^1.0.17"
   },
   "tasks": {
     "test:run": "deno test -A",

deno.lock

@@ -1,22 +1,20 @@
-import { Database as BaseDb } from "@db/sqlite";
-import { Database } from "@dldc/zendb";
+import { Database } from "@db/sqlite";
+import { Utils } from "@dldc/zendb";
 import { expect } from "@std/expect";
-import { DbDatabase } from "./mod.ts";
+import { DbSqliteDriver } from "./mod.ts";
 
 Deno.test("read pragma", () => {
-  const sqldb = new BaseDb(":memory:");
-  const db = DbDatabase(sqldb);
+  const db = new Database(":memory:");
 
-  const res = db.exec(Database.userVersion());
+  const res = DbSqliteDriver.exec(db, Utils.userVersion());
   expect(res).toEqual(0);
 });
 
 Deno.test("write pragma", () => {
-  const sqldb = new BaseDb(":memory:");
-  const db = DbDatabase(sqldb);
+  const db = new Database(":memory:");
 
-  const res = db.exec(Database.setUserVersion(42));
+  const res = DbSqliteDriver.exec(db, Utils.setUserVersion(42));
   expect(res).toEqual(null);
-  const version = db.exec(Database.userVersion());
+  const version = DbSqliteDriver.exec(db, Utils.userVersion());
   expect(version).toEqual(42);
 });

mod.test.ts

@@ -1,85 +1,8 @@
-import type { Database } from "@db/sqlite";
-import type * as zen from "@dldc/zendb";
-
-export interface TDbDatabase {
-  exec<Op extends zen.TOperation>(op: Op): zen.TOperationResult<Op>;
-  execMany<Op extends zen.TOperation>(ops: Op[]): zen.TOperationResult<Op>[];
-  readonly sqlDb: Database;
-}
-
-export function DbDatabase(sqlDb: Database): TDbDatabase {
-  return {
-    exec,
-    execMany,
-    sqlDb,
-  };
-
-  function exec<Op extends zen.TOperation>(op: Op): zen.TOperationResult<Op> {
-    if (op.kind === "CreateTable") {
-      sqlDb.exec(op.sql);
-      return opResult<zen.TCreateTableOperation>(null);
-    }
-    if (op.kind === "DropTable") {
-      sqlDb.exec(op.sql);
-      return opResult<zen.TDropTableOperation>(null);
-    }
-    if (op.kind === "Insert") {
-      sqlDb.prepare(op.sql).run(op.params);
-      return opResult<zen.TInsertOperation<any>>(op.parse());
-    }
-    if (op.kind === "InsertMany") {
-      sqlDb.prepare(op.sql).run(op.params);
-      return opResult<zen.TInsertOperation<any>>(op.parse());
-    }
-    if (op.kind === "Delete") {
-      const stmt = sqlDb.prepare(op.sql);
-      const res = op.params ? stmt.run(op.params) : stmt.run();
-      return opResult<zen.TDeleteOperation>(op.parse({ deleted: res }));
-    }
-    if (op.kind === "Update") {
-      const stmt = sqlDb.prepare(op.sql);
-      const res = op.params ? stmt.run(op.params) : stmt.run();
-      return opResult<zen.TUpdateOperation>(op.parse({ updated: res }));
-    }
-    if (op.kind === "Query") {
-      const stmt = sqlDb.prepare(op.sql);
-      const res = op.params ? stmt.all(op.params) : stmt.all();
-      return opResult<zen.TQueryOperation<any>>(
-        op.parse(res as Record<string, any>[]),
-      );
-    }
-    if (op.kind === "ListTables") {
-      const res = sqlDb.prepare(op.sql).all();
-      return opResult<zen.TListTablesOperation>(
-        op.parse(res as Record<string, any>[]),
-      );
-    }
-    if (op.kind === "Pragma") {
-      const res = sqlDb.prepare(op.sql).all();
-      return opResult<zen.TPragmaOperation<any>>(
-        op.parse(res as Record<string, any>[]),
-      );
-    }
-    if (op.kind === "PragmaSet") {
-      sqlDb.prepare(op.sql).run();
-      return opResult<zen.TPragmaSetOperation>(null);
-    }
-    return expectNever(op);
-  }
-
-  function opResult<Op extends zen.TOperation>(
-    res: zen.TOperationResult<Op>,
-  ): zen.TOperationResult<zen.TOperation> {
-    return res;
-  }
-
-  function execMany<Op extends zen.TOperation>(
-    ops: Op[],
-  ): zen.TOperationResult<Op>[] {
-    return ops.map((op) => exec(op));
-  }
-}
-
-function expectNever(val: never): never {
-  throw new Error(`Unexpected value: ${val as any}`);
-}
+import { Database } from "@db/sqlite";
+import { Driver } from "@dldc/zendb";
+
+export const DbSqliteDriver = Driver.createDriverFromPrepare<Database>({
+  exec: (db, sql) => db.exec(sql),
+  prepare: (db, sql) => db.prepare(sql),
+  createDatabase: () => new Database(":memory:"),
+});