@bibliotek/sqlite 0.0.6 → 0.1.0

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2022 Richard Remer
+Copyright © 2022-2026 Richard Remer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bibliotek/sqlite",
-  "version": "0.0.6",
+  "version": "0.1.0",
   "description": "Sqlite3 database using async/await",
   "type": "module",
   "exports": "./sqlite.js",
@@ -10,11 +10,11 @@
   "license": "MIT",
   "dependencies": {
     "@bibliotek/synch": "^0.0.1",
-    "sqlite3": "^4.2.0"
+    "sqlite3": "^6.0.1"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "mocha": "^9.2.0",
-    "sinon": "^13.0.1"
+    "mocha": "^12.0.0",
+    "sinon": "^22.1.0"
   }
 }

package/sqlite.js

@@ -1,13 +1,26 @@
+import {Console} from "console";
 import Sqlite3 from "sqlite3";
 import synch from "@bibliotek/synch";
 
 export class Database {
-  constructor(db) {
+  db;
+  console;
+
+  /**
+   * @param {Sqlite3.Database} db
+   * @param {Console} [console]
+   */
+  constructor(db, console=undefined) {
     if (typeof db === "string") {
       db = new Sqlite3.Database(db);
     }
 
+    if (!console) {
+      console = {log() {}, debug() {}, info() {}, warn() {}, error() {}};
+    }
+
     this.db = db;
+    this.console = console;
   }
 
   static memory() {
@@ -35,6 +48,7 @@ export class Database {
     let done = false;
     let sync = synch();
 
+    this.console.debug(String(sql));
     this.db.each(String(sql), record, complete);
 
     while (!done) {
@@ -57,6 +71,7 @@ export class Database {
 
   async exec(sql) {
     return new Promise((resolve, reject) => {
+      this.console.debug(String(sql));
       this.db.exec(String(sql), err => {
         if (err) reject(err); else resolve();
       });
@@ -65,6 +80,7 @@ export class Database {
 
   async get(sql, ...params) {
     return new Promise((resolve, reject) => {
+      this.console.debug(String(sql));
       this.db.get(String(sql), ...params, (err, row) => {
         if (err) reject(err); else resolve(row);
       });
@@ -72,11 +88,13 @@ export class Database {
   }
 
   prepare(sql) {
+    this.console.debug(String(sql));
     return new Statement(this.db.prepare(String(sql)));
   }
 
   async run(sql) {
     return new Promise((resolve, reject) => {
+      this.console.debug(String(sql));
       this.db.run(String(sql), function(err) {
         if (err) {
           reject(err);

package/test/test-sqlite.js

@@ -145,6 +145,18 @@ describe("Database", () => {
       expect(stmt).to.be.a(Statement);
     });
   });
+
+  describe("logging", () => {
+    it("should log queries to provided console", async () => {
+      const console = mockConsole();
+      const sqlite = new Database(":memory:", console);
+
+      await sqlite.run("create table t (i int, f text)");
+
+      expect(console.debug.calledOnce).to.be(true);
+      expect(console.debug.calledWith("create table t (i int, f text)")).to.be(true);
+    });
+  });
 });
 
 describe("Statement", () => {
@@ -237,3 +249,13 @@ describe("Statement", () => {
     });
   });
 });
+
+function mockConsole() {
+  return {
+    log: sinon.spy(),
+    debug: sinon.spy(),
+    info: sinon.spy(),
+    warn: sinon.spy(),
+    error: sinon.spy(),
+  };
+}