sqlite-zod-orm 3.24.0 → 3.26.0

package/dist/index.js

@@ -5220,12 +5220,12 @@ function executeProxyQuery(schemas, callback, executor) {
 function createQueryBuilder(ctx, entityName, initialCols) {
   const schema = ctx.schemas[entityName];
   const executor = (sql, params, raw) => {
-    if (ctx.debug)
-      console.log("[satidb]", sql, params);
-    const rows = ctx.db.query(sql).all(...params);
-    if (raw)
-      return rows;
-    return rows.map((row) => ctx.attachMethods(entityName, transformFromStorage(row, schema)));
+    return ctx._m(`SQL: ${sql.slice(0, 60)}`, () => {
+      const rows = ctx._stmt(sql).all(...params);
+      if (raw)
+        return rows;
+      return rows.map((row) => ctx.attachMethods(entityName, transformFromStorage(row, schema)));
+    });
   };
   const singleExecutor = (sql, params, raw) => {
     const results = executor(sql, params, raw);
@@ -5269,7 +5269,7 @@ function createQueryBuilder(ctx, entityName, initialCols) {
       if (belongsTo2) {
         const fk = belongsTo2.foreignKey;
         const placeholders = parentIds.map(() => "?").join(", ");
-        const childRows = ctx.db.query(`SELECT * FROM ${hasMany.to} WHERE ${fk} IN (${placeholders})`).all(...parentIds);
+        const childRows = ctx._stmt(`SELECT * FROM ${hasMany.to} WHERE ${fk} IN (${placeholders})`).all(...parentIds);
         const groups = new Map;
         const childSchema = ctx.schemas[hasMany.to];
         for (const rawRow of childRows) {
@@ -5381,21 +5381,21 @@ function buildWhereClause(conditions, tablePrefix) {
 
 // src/crud.ts
 function getById(ctx, entityName, id) {
-  const row = ctx.db.query(`SELECT * FROM "${entityName}" WHERE id = ?`).get(id);
+  const row = ctx._stmt(`SELECT * FROM "${entityName}" WHERE id = ?`).get(id);
   if (!row)
     return null;
   return ctx.attachMethods(entityName, transformFromStorage(row, ctx.schemas[entityName]));
 }
 function getOne(ctx, entityName, conditions) {
   const { clause, values } = ctx.buildWhereClause(conditions);
-  const row = ctx.db.query(`SELECT * FROM "${entityName}" ${clause} LIMIT 1`).get(...values);
+  const row = ctx._stmt(`SELECT * FROM "${entityName}" ${clause} LIMIT 1`).get(...values);
   if (!row)
     return null;
   return ctx.attachMethods(entityName, transformFromStorage(row, ctx.schemas[entityName]));
 }
 function findMany(ctx, entityName, conditions = {}) {
   const { clause, values } = ctx.buildWhereClause(conditions);
-  const rows = ctx.db.query(`SELECT * FROM "${entityName}" ${clause}`).all(...values);
+  const rows = ctx._stmt(`SELECT * FROM "${entityName}" ${clause}`).all(...values);
   return rows.map((row) => ctx.attachMethods(entityName, transformFromStorage(row, ctx.schemas[entityName])));
 }
 function insert(ctx, entityName, data) {
@@ -5403,9 +5403,9 @@ function insert(ctx, entityName, data) {
   let inputData = { ...data };
   const hooks = ctx.hooks[entityName];
   if (hooks?.beforeInsert) {
-    const result2 = hooks.beforeInsert(inputData);
-    if (result2)
-      inputData = result2;
+    const result = hooks.beforeInsert(inputData);
+    if (result)
+      inputData = result;
   }
   const validatedData = asZodObject(schema).passthrough().parse(inputData);
   const transformed = transformForStorage(validatedData);
@@ -5417,10 +5417,12 @@ function insert(ctx, entityName, data) {
   const columns = Object.keys(transformed);
   const quotedCols = columns.map((c) => `"${c}"`);
   const sql = columns.length === 0 ? `INSERT INTO "${entityName}" DEFAULT VALUES` : `INSERT INTO "${entityName}" (${quotedCols.join(", ")}) VALUES (${columns.map(() => "?").join(", ")})`;
-  if (ctx.debug)
-    console.log("[satidb]", sql, Object.values(transformed));
-  const result = ctx.db.query(sql).run(...Object.values(transformed));
-  const newEntity = getById(ctx, entityName, result.lastInsertRowid);
+  let lastId = 0;
+  ctx._m(`SQL: ${sql.slice(0, 40)}`, () => {
+    const result = ctx._stmt(sql).run(...Object.values(transformed));
+    lastId = result.lastInsertRowid;
+  });
+  const newEntity = getById(ctx, entityName, lastId);
   if (!newEntity)
     throw new Error("Failed to retrieve entity after insertion");
   if (hooks?.afterInsert)
@@ -5445,9 +5447,9 @@ function update(ctx, entityName, id, data) {
   }
   const setClause = Object.keys(transformed).map((key) => `"${key}" = ?`).join(", ");
   const sql = `UPDATE "${entityName}" SET ${setClause} WHERE id = ?`;
-  if (ctx.debug)
-    console.log("[satidb]", sql, [...Object.values(transformed), id]);
-  ctx.db.query(sql).run(...Object.values(transformed), id);
+  ctx._m(`SQL: UPDATE ${entityName} SET ...`, () => {
+    ctx._stmt(sql).run(...Object.values(transformed), id);
+  });
   const updated = getById(ctx, entityName, id);
   if (hooks?.afterUpdate && updated)
     hooks.afterUpdate(updated);
@@ -5464,7 +5466,7 @@ function updateWhere(ctx, entityName, data, conditions) {
     throw new Error("update().where() requires at least one condition");
   const setCols = Object.keys(transformed);
   const setClause = setCols.map((key) => `"${key}" = ?`).join(", ");
-  const result = ctx.db.query(`UPDATE "${entityName}" SET ${setClause} ${clause}`).run(...setCols.map((key) => transformed[key]), ...whereValues);
+  const result = ctx._stmt(`UPDATE "${entityName}" SET ${setClause} ${clause}`).run(...setCols.map((key) => transformed[key]), ...whereValues);
   return result.changes ?? 0;
 }
 function createUpdateBuilder(ctx, entityName, data) {
@@ -5505,7 +5507,7 @@ function deleteEntity(ctx, entityName, id) {
     if (result === false)
       return;
   }
-  ctx.db.query(`DELETE FROM "${entityName}" WHERE id = ?`).run(id);
+  ctx._stmt(`DELETE FROM "${entityName}" WHERE id = ?`).run(id);
   if (hooks?.afterDelete)
     hooks.afterDelete(id);
 }
@@ -5516,15 +5518,11 @@ function deleteWhere(ctx, entityName, conditions) {
   if (ctx.softDeletes) {
     const now = new Date().toISOString();
     const sql2 = `UPDATE "${entityName}" SET "deletedAt" = ? ${clause}`;
-    if (ctx.debug)
-      console.log("[satidb]", sql2, [now, ...values]);
-    const result2 = ctx.db.query(sql2).run(now, ...values);
+    const result2 = ctx._m(`SQL: ${sql2.slice(0, 50)}`, () => ctx._stmt(sql2).run(now, ...values));
     return result2.changes ?? 0;
   }
   const sql = `DELETE FROM "${entityName}" ${clause}`;
-  if (ctx.debug)
-    console.log("[satidb]", sql, values);
-  const result = ctx.db.query(sql).run(...values);
+  const result = ctx._m(`SQL: ${sql.slice(0, 50)}`, () => ctx._stmt(sql).run(...values));
   return result.changes ?? 0;
 }
 function createDeleteBuilder(ctx, entityName) {
@@ -5563,7 +5561,7 @@ function insertMany(ctx, entityName, rows) {
       const columns = Object.keys(transformed);
       const quotedCols = columns.map((c) => `"${c}"`);
       const sql = columns.length === 0 ? `INSERT INTO "${entityName}" DEFAULT VALUES` : `INSERT INTO "${entityName}" (${quotedCols.join(", ")}) VALUES (${columns.map(() => "?").join(", ")})`;
-      const result = ctx.db.query(sql).run(...Object.values(transformed));
+      const result = ctx._stmt(sql).run(...Object.values(transformed));
       ids2.push(result.lastInsertRowid);
     }
     return ids2;
@@ -5649,6 +5647,15 @@ class _Database {
   _pollTimer = null;
   _pollInterval;
   _measure;
+  _stmtCache = new Map;
+  _stmt(sql) {
+    let stmt = this._stmtCache.get(sql);
+    if (!stmt) {
+      stmt = this.db.query(sql);
+      this._stmtCache.set(sql, stmt);
+    }
+    return stmt;
+  }
   _m(label, fn) {
     if (this._debug)
       return this._measure.measureSync.assert(label, fn);
@@ -5679,7 +5686,9 @@ class _Database {
       softDeletes: this._softDeletes,
       hooks: options.hooks ?? {},
       computed: options.computed ?? {},
-      cascade: options.cascade ?? {}
+      cascade: options.cascade ?? {},
+      _m: (label, fn) => this._m(label, fn),
+      _stmt: (sql) => this._stmt(sql)
     };
     this._m("Init tables", () => this.initializeTables());
     if (this._reactive)
@@ -5696,55 +5705,59 @@ class _Database {
         insertMany: (rows) => this._m(`${entityName}.insertMany(${rows.length})`, () => insertMany(this._ctx, entityName, rows)),
         update: (idOrData, data) => {
           if (typeof idOrData === "number")
-            return update(this._ctx, entityName, idOrData, data);
+            return this._m(`${entityName}.update(${idOrData})`, () => update(this._ctx, entityName, idOrData, data));
           return createUpdateBuilder(this._ctx, entityName, idOrData);
         },
-        upsert: (conditions, data) => upsert(this._ctx, entityName, data, conditions),
-        upsertMany: (rows, conditions) => upsertMany(this._ctx, entityName, rows, conditions),
-        findOrCreate: (conditions, defaults) => findOrCreate(this._ctx, entityName, conditions, defaults),
+        upsert: (conditions, data) => this._m(`${entityName}.upsert`, () => upsert(this._ctx, entityName, data, conditions)),
+        upsertMany: (rows, conditions) => this._m(`${entityName}.upsertMany(${rows.length})`, () => upsertMany(this._ctx, entityName, rows, conditions)),
+        findOrCreate: (conditions, defaults) => this._m(`${entityName}.findOrCreate`, () => findOrCreate(this._ctx, entityName, conditions, defaults)),
         delete: (id) => {
           if (typeof id === "number") {
-            const hooks = this._ctx.hooks[entityName];
-            if (hooks?.beforeDelete) {
-              const result = hooks.beforeDelete(id);
-              if (result === false)
-                return;
-            }
-            const cascadeTargets = this._ctx.cascade[entityName];
-            if (cascadeTargets) {
-              for (const childTable of cascadeTargets) {
-                const rel = this._ctx.relationships.find((r) => r.type === "belongs-to" && r.from === childTable && r.to === entityName);
-                if (rel) {
-                  if (this._softDeletes) {
-                    const now = new Date().toISOString();
-                    this.db.query(`UPDATE "${childTable}" SET "deletedAt" = ? WHERE "${rel.foreignKey}" = ?`).run(now, id);
-                  } else {
-                    this.db.query(`DELETE FROM "${childTable}" WHERE "${rel.foreignKey}" = ?`).run(id);
+            return this._m(`${entityName}.delete(${id})`, () => {
+              const hooks = this._ctx.hooks[entityName];
+              if (hooks?.beforeDelete) {
+                const result = hooks.beforeDelete(id);
+                if (result === false)
+                  return;
+              }
+              const cascadeTargets = this._ctx.cascade[entityName];
+              if (cascadeTargets) {
+                for (const childTable of cascadeTargets) {
+                  const rel = this._ctx.relationships.find((r) => r.type === "belongs-to" && r.from === childTable && r.to === entityName);
+                  if (rel) {
+                    if (this._softDeletes) {
+                      const now = new Date().toISOString();
+                      this._stmt(`UPDATE "${childTable}" SET "deletedAt" = ? WHERE "${rel.foreignKey}" = ?`).run(now, id);
+                    } else {
+                      this._stmt(`DELETE FROM "${childTable}" WHERE "${rel.foreignKey}" = ?`).run(id);
+                    }
                   }
                 }
               }
-            }
-            if (this._softDeletes) {
-              const now = new Date().toISOString();
-              this.db.query(`UPDATE "${entityName}" SET "deletedAt" = ? WHERE id = ?`).run(now, id);
-              if (hooks?.afterDelete)
-                hooks.afterDelete(id);
-              return;
-            }
-            return deleteEntity(this._ctx, entityName, id);
+              if (this._softDeletes) {
+                const now = new Date().toISOString();
+                this._stmt(`UPDATE "${entityName}" SET "deletedAt" = ? WHERE id = ?`).run(now, id);
+                if (hooks?.afterDelete)
+                  hooks.afterDelete(id);
+                return;
+              }
+              return deleteEntity(this._ctx, entityName, id);
+            });
           }
           return createDeleteBuilder(this._ctx, entityName);
         },
         restore: (id) => {
           if (!this._softDeletes)
             throw new Error("restore() requires softDeletes: true");
-          this.db.query(`UPDATE "${entityName}" SET "deletedAt" = NULL WHERE id = ?`).run(id);
+          this._m(`${entityName}.restore(${id})`, () => {
+            this._stmt(`UPDATE "${entityName}" SET "deletedAt" = NULL WHERE id = ?`).run(id);
+          });
         },
         select: (...cols) => createQueryBuilder(this._ctx, entityName, cols),
-        count: () => {
-          const row = this.db.query(`SELECT COUNT(*) as count FROM "${entityName}"${this._softDeletes ? ' WHERE "deletedAt" IS NULL' : ""}`).get();
+        count: () => this._m(`${entityName}.count`, () => {
+          const row = this._stmt(`SELECT COUNT(*) as count FROM "${entityName}"${this._softDeletes ? ' WHERE "deletedAt" IS NULL' : ""}`).get();
           return row?.count ?? 0;
-        },
+        }),
         on: (event, callback) => {
           return this._registerListener(entityName, event, callback);
         },
@@ -5858,11 +5871,11 @@ class _Database {
     }
   }
   _processChanges() {
-    const head = this.db.query('SELECT MAX(id) as m FROM "_changes"').get();
+    const head = this._stmt('SELECT MAX(id) as m FROM "_changes"').get();
     const maxId = head?.m ?? 0;
     if (maxId <= this._changeWatermark)
       return;
-    const changes = this.db.query('SELECT id, tbl, op, row_id FROM "_changes" WHERE id > ? ORDER BY id').all(this._changeWatermark);
+    const changes = this._stmt('SELECT id, tbl, op, row_id FROM "_changes" WHERE id > ? ORDER BY id').all(this._changeWatermark);
     for (const change of changes) {
       const listeners = this._listeners.filter((l) => l.table === change.tbl && l.event === change.op);
       if (listeners.length > 0) {
@@ -5886,31 +5899,26 @@ class _Database {
       }
       this._changeWatermark = change.id;
     }
-    this.db.query('DELETE FROM "_changes" WHERE id <= ?').run(this._changeWatermark);
+    this._stmt('DELETE FROM "_changes" WHERE id <= ?').run(this._changeWatermark);
   }
   transaction(callback) {
-    return this.db.transaction(callback)();
+    return this._m("transaction", () => this.db.transaction(callback)());
   }
   close() {
     this._stopPolling();
+    this._stmtCache.clear();
     this.db.close();
   }
   query(callback) {
-    return executeProxyQuery(this.schemas, callback, (sql, params) => {
-      if (this._debug)
-        console.log("[satidb]", sql, params);
-      return this.db.query(sql).all(...params);
-    });
+    return this._m("query(proxy)", () => executeProxyQuery(this.schemas, callback, (sql, params) => {
+      return this._stmt(sql).all(...params);
+    }));
   }
   raw(sql, ...params) {
-    if (this._debug)
-      console.log("[satidb]", sql, params);
-    return this.db.query(sql).all(...params);
+    return this._m(`raw: ${sql.slice(0, 60)}`, () => this._stmt(sql).all(...params));
   }
   exec(sql, ...params) {
-    if (this._debug)
-      console.log("[satidb]", sql, params);
-    this.db.run(sql, ...params);
+    this._m(`exec: ${sql.slice(0, 60)}`, () => this.db.run(sql, ...params));
   }
   tables() {
     return Object.keys(this.schemas);
@@ -5919,70 +5927,76 @@ class _Database {
     return this.db.query(`PRAGMA table_info("${tableName}")`).all();
   }
   dump() {
-    const result = {};
-    for (const tableName of Object.keys(this.schemas)) {
-      result[tableName] = this.db.query(`SELECT * FROM "${tableName}"`).all();
-    }
-    return result;
+    return this._m("dump", () => {
+      const result = {};
+      for (const tableName of Object.keys(this.schemas)) {
+        result[tableName] = this.db.query(`SELECT * FROM "${tableName}"`).all();
+      }
+      return result;
+    });
   }
   load(data, options) {
-    const txn = this.db.transaction(() => {
-      for (const [tableName, rows] of Object.entries(data)) {
-        if (!this.schemas[tableName])
-          continue;
-        if (!options?.append) {
-          this.db.run(`DELETE FROM "${tableName}"`);
-        }
-        for (const row of rows) {
-          const cols = Object.keys(row).filter((k) => k !== "id");
-          const placeholders = cols.map(() => "?").join(", ");
-          const values = cols.map((c) => {
-            const v = row[c];
-            if (v !== null && v !== undefined && typeof v === "object" && !(v instanceof Buffer)) {
-              return JSON.stringify(v);
-            }
-            return v;
-          });
-          this.db.query(`INSERT INTO "${tableName}" (${cols.map((c) => `"${c}"`).join(", ")}) VALUES (${placeholders})`).run(...values);
+    this._m(`load(${Object.keys(data).join(",")})`, () => {
+      const txn = this.db.transaction(() => {
+        for (const [tableName, rows] of Object.entries(data)) {
+          if (!this.schemas[tableName])
+            continue;
+          if (!options?.append) {
+            this.db.run(`DELETE FROM "${tableName}"`);
+          }
+          for (const row of rows) {
+            const cols = Object.keys(row).filter((k) => k !== "id");
+            const placeholders = cols.map(() => "?").join(", ");
+            const values = cols.map((c) => {
+              const v = row[c];
+              if (v !== null && v !== undefined && typeof v === "object" && !(v instanceof Buffer)) {
+                return JSON.stringify(v);
+              }
+              return v;
+            });
+            this.db.query(`INSERT INTO "${tableName}" (${cols.map((c) => `"${c}"`).join(", ")}) VALUES (${placeholders})`).run(...values);
+          }
         }
-      }
+      });
+      txn();
     });
-    txn();
   }
   seed(fixtures) {
     this.load(fixtures, { append: true });
   }
   diff() {
-    const result = {};
-    const systemCols = new Set(["id", "createdAt", "updatedAt", "deletedAt"]);
-    for (const [tableName, schema] of Object.entries(this.schemas)) {
-      const schemaFields = getStorableFields(schema);
-      const schemaColMap = new Map(schemaFields.map((f) => [f.name, zodTypeToSqlType(f.type)]));
-      const liveColumns = this.columns(tableName);
-      const liveColMap = new Map(liveColumns.map((c) => [c.name, c.type]));
-      const added = [];
-      const removed = [];
-      const typeChanged = [];
-      for (const [col, expectedType] of schemaColMap) {
-        if (!liveColMap.has(col)) {
-          added.push(col);
-        } else {
-          const actualType = liveColMap.get(col);
-          if (actualType !== expectedType) {
-            typeChanged.push({ column: col, expected: expectedType, actual: actualType });
+    return this._m("diff", () => {
+      const result = {};
+      const systemCols = new Set(["id", "createdAt", "updatedAt", "deletedAt"]);
+      for (const [tableName, schema] of Object.entries(this.schemas)) {
+        const schemaFields = getStorableFields(schema);
+        const schemaColMap = new Map(schemaFields.map((f) => [f.name, zodTypeToSqlType(f.type)]));
+        const liveColumns = this.columns(tableName);
+        const liveColMap = new Map(liveColumns.map((c) => [c.name, c.type]));
+        const added = [];
+        const removed = [];
+        const typeChanged = [];
+        for (const [col, expectedType] of schemaColMap) {
+          if (!liveColMap.has(col)) {
+            added.push(col);
+          } else {
+            const actualType = liveColMap.get(col);
+            if (actualType !== expectedType) {
+              typeChanged.push({ column: col, expected: expectedType, actual: actualType });
+            }
           }
         }
-      }
-      for (const col of liveColMap.keys()) {
-        if (!systemCols.has(col) && !schemaColMap.has(col)) {
-          removed.push(col);
+        for (const col of liveColMap.keys()) {
+          if (!systemCols.has(col) && !schemaColMap.has(col)) {
+            removed.push(col);
+          }
+        }
+        if (added.length > 0 || removed.length > 0 || typeChanged.length > 0) {
+          result[tableName] = { added, removed, typeChanged };
         }
       }
-      if (added.length > 0 || removed.length > 0 || typeChanged.length > 0) {
-        result[tableName] = { added, removed, typeChanged };
-      }
-    }
-    return result;
+      return result;
+    });
   }
 }
 var Database = _Database;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlite-zod-orm",
-  "version": "3.24.0",
+  "version": "3.26.0",
   "description": "Type-safe SQLite ORM for Bun — Zod schemas, fluent queries, auto relationships, zero SQL",
   "type": "module",
   "main": "./dist/index.js",

package/src/context.ts

@@ -40,4 +40,16 @@ export interface DatabaseContext {
 
     /** Cascade delete config — parent table → list of child tables to auto-delete. */
     cascade: Record<string, string[]>;
+
+    /**
+     * Conditional measurement helper — wraps fn with measure-fn when debug is on.
+     * When debug is off, executes fn directly with zero overhead.
+     */
+    _m<T>(label: string, fn: () => T): T;
+
+    /**
+     * Get a cached prepared statement. Compiles SQL once, reuses on subsequent calls.
+     * Falls back to `db.query(sql)` if the statement was finalized.
+     */
+    _stmt(sql: string): ReturnType<SqliteDatabase['query']>;
 }

package/src/crud.ts

@@ -14,21 +14,21 @@ import type { DatabaseContext } from './context';
 // ---------------------------------------------------------------------------
 
 export function getById(ctx: DatabaseContext, entityName: string, id: number): AugmentedEntity<any> | null {
-    const row = ctx.db.query(`SELECT * FROM "${entityName}" WHERE id = ?`).get(id) as any;
+    const row = ctx._stmt(`SELECT * FROM "${entityName}" WHERE id = ?`).get(id) as any;
     if (!row) return null;
     return ctx.attachMethods(entityName, transformFromStorage(row, ctx.schemas[entityName]!));
 }
 
 export function getOne(ctx: DatabaseContext, entityName: string, conditions: Record<string, any>): AugmentedEntity<any> | null {
     const { clause, values } = ctx.buildWhereClause(conditions);
-    const row = ctx.db.query(`SELECT * FROM "${entityName}" ${clause} LIMIT 1`).get(...values) as any;
+    const row = ctx._stmt(`SELECT * FROM "${entityName}" ${clause} LIMIT 1`).get(...values) as any;
     if (!row) return null;
     return ctx.attachMethods(entityName, transformFromStorage(row, ctx.schemas[entityName]!));
 }
 
 export function findMany(ctx: DatabaseContext, entityName: string, conditions: Record<string, any> = {}): AugmentedEntity<any>[] {
     const { clause, values } = ctx.buildWhereClause(conditions);
-    const rows = ctx.db.query(`SELECT * FROM "${entityName}" ${clause}`).all(...values);
+    const rows = ctx._stmt(`SELECT * FROM "${entityName}" ${clause}`).all(...values);
     return rows.map((row: any) =>
         ctx.attachMethods(entityName, transformFromStorage(row, ctx.schemas[entityName]!))
     );
@@ -66,9 +66,12 @@ export function insert<T extends Record<string, any>>(ctx: DatabaseContext, enti
         ? `INSERT INTO "${entityName}" DEFAULT VALUES`
         : `INSERT INTO "${entityName}" (${quotedCols.join(', ')}) VALUES (${columns.map(() => '?').join(', ')})`;
 
-    if (ctx.debug) console.log('[satidb]', sql, Object.values(transformed));
-    const result = ctx.db.query(sql).run(...Object.values(transformed));
-    const newEntity = getById(ctx, entityName, result.lastInsertRowid as number);
+    let lastId = 0;
+    ctx._m(`SQL: ${sql.slice(0, 40)}`, () => {
+        const result = ctx._stmt(sql).run(...Object.values(transformed));
+        lastId = result.lastInsertRowid as number;
+    });
+    const newEntity = getById(ctx, entityName, lastId);
     if (!newEntity) throw new Error('Failed to retrieve entity after insertion');
 
     // afterInsert hook
@@ -99,8 +102,9 @@ export function update<T extends Record<string, any>>(ctx: DatabaseContext, enti
 
     const setClause = Object.keys(transformed).map(key => `"${key}" = ?`).join(', ');
     const sql = `UPDATE "${entityName}" SET ${setClause} WHERE id = ?`;
-    if (ctx.debug) console.log('[satidb]', sql, [...Object.values(transformed), id]);
-    ctx.db.query(sql).run(...Object.values(transformed), id);
+    ctx._m(`SQL: UPDATE ${entityName} SET ...`, () => {
+        ctx._stmt(sql).run(...Object.values(transformed), id);
+    });
 
     const updated = getById(ctx, entityName, id);
 
@@ -121,7 +125,7 @@ export function updateWhere(ctx: DatabaseContext, entityName: string, data: Reco
 
     const setCols = Object.keys(transformed);
     const setClause = setCols.map(key => `"${key}" = ?`).join(', ');
-    const result = ctx.db.query(`UPDATE "${entityName}" SET ${setClause} ${clause}`).run(
+    const result = ctx._stmt(`UPDATE "${entityName}" SET ${setClause} ${clause}`).run(
         ...setCols.map(key => transformed[key]),
         ...whereValues
     );
@@ -177,7 +181,7 @@ export function deleteEntity(ctx: DatabaseContext, entityName: string, id: numbe
         if (result === false) return;
     }
 
-    ctx.db.query(`DELETE FROM "${entityName}" WHERE id = ?`).run(id);
+    ctx._stmt(`DELETE FROM "${entityName}" WHERE id = ?`).run(id);
 
     // afterDelete hook
     if (hooks?.afterDelete) hooks.afterDelete(id);
@@ -192,14 +196,12 @@ export function deleteWhere(ctx: DatabaseContext, entityName: string, conditions
         // Soft delete: set deletedAt instead of removing rows
         const now = new Date().toISOString();
         const sql = `UPDATE "${entityName}" SET "deletedAt" = ? ${clause}`;
-        if (ctx.debug) console.log('[satidb]', sql, [now, ...values]);
-        const result = ctx.db.query(sql).run(now, ...values);
+        const result = ctx._m(`SQL: ${sql.slice(0, 50)}`, () => ctx._stmt(sql).run(now, ...values));
         return (result as any).changes ?? 0;
     }
 
     const sql = `DELETE FROM "${entityName}" ${clause}`;
-    if (ctx.debug) console.log('[satidb]', sql, values);
-    const result = ctx.db.query(sql).run(...values);
+    const result = ctx._m(`SQL: ${sql.slice(0, 50)}`, () => ctx._stmt(sql).run(...values));
     return (result as any).changes ?? 0;
 }
 
@@ -245,7 +247,7 @@ export function insertMany<T extends Record<string, any>>(ctx: DatabaseContext,
             const sql = columns.length === 0
                 ? `INSERT INTO "${entityName}" DEFAULT VALUES`
                 : `INSERT INTO "${entityName}" (${quotedCols.join(', ')}) VALUES (${columns.map(() => '?').join(', ')})`;
-            const result = ctx.db.query(sql).run(...Object.values(transformed));
+            const result = ctx._stmt(sql).run(...Object.values(transformed));
             ids.push(result.lastInsertRowid as number);
         }
         return ids;

package/src/database.ts

@@ -67,6 +67,19 @@ class _Database<Schemas extends SchemaMap> {
     /** Scoped measure-fn instance for instrumentation. */
     private _measure: ReturnType<typeof createMeasure>;
 
+    /** Prepared statement cache — avoids re-compiling identical SQL. */
+    private _stmtCache = new Map<string, ReturnType<SqliteDatabase['query']>>();
+
+    /** Get or create a cached prepared statement. */
+    private _stmt(sql: string): ReturnType<SqliteDatabase['query']> {
+        let stmt = this._stmtCache.get(sql);
+        if (!stmt) {
+            stmt = this.db.query(sql);
+            this._stmtCache.set(sql, stmt);
+        }
+        return stmt;
+    }
+
     /**
      * Conditional measurement helper — wraps with measure-fn only when debug is on.
      * When debug is off, executes fn directly with zero overhead.
@@ -104,6 +117,8 @@ class _Database<Schemas extends SchemaMap> {
             hooks: options.hooks ?? {},
             computed: options.computed ?? {},
             cascade: options.cascade ?? {},
+            _m: <T>(label: string, fn: () => T): T => this._m(label, fn),
+            _stmt: (sql: string) => this._stmt(sql),
         };
 
         this._m('Init tables', () => this.initializeTables());
@@ -119,60 +134,62 @@ class _Database<Schemas extends SchemaMap> {
                 insert: (data) => this._m(`${entityName}.insert`, () => insert(this._ctx, entityName, data)),
                 insertMany: (rows: any[]) => this._m(`${entityName}.insertMany(${rows.length})`, () => insertMany(this._ctx, entityName, rows)),
                 update: (idOrData: any, data?: any) => {
-                    if (typeof idOrData === 'number') return update(this._ctx, entityName, idOrData, data);
+                    if (typeof idOrData === 'number') return this._m(`${entityName}.update(${idOrData})`, () => update(this._ctx, entityName, idOrData, data));
                     return createUpdateBuilder(this._ctx, entityName, idOrData);
                 },
-                upsert: (conditions, data) => upsert(this._ctx, entityName, data, conditions),
-                upsertMany: (rows: any[], conditions?: any) => upsertMany(this._ctx, entityName, rows, conditions),
-                findOrCreate: (conditions: any, defaults?: any) => findOrCreate(this._ctx, entityName, conditions, defaults),
+                upsert: (conditions, data) => this._m(`${entityName}.upsert`, () => upsert(this._ctx, entityName, data, conditions)),
+                upsertMany: (rows: any[], conditions?: any) => this._m(`${entityName}.upsertMany(${rows.length})`, () => upsertMany(this._ctx, entityName, rows, conditions)),
+                findOrCreate: (conditions: any, defaults?: any) => this._m(`${entityName}.findOrCreate`, () => findOrCreate(this._ctx, entityName, conditions, defaults)),
                 delete: ((id?: any) => {
                     if (typeof id === 'number') {
-                        // beforeDelete hook — return false to cancel
-                        const hooks = this._ctx.hooks[entityName];
-                        if (hooks?.beforeDelete) {
-                            const result = hooks.beforeDelete(id);
-                            if (result === false) return;
-                        }
+                        return this._m(`${entityName}.delete(${id})`, () => {
+                            // beforeDelete hook — return false to cancel
+                            const hooks = this._ctx.hooks[entityName];
+                            if (hooks?.beforeDelete) {
+                                const result = hooks.beforeDelete(id);
+                                if (result === false) return;
+                            }
 
-                        // Cascade delete children first
-                        const cascadeTargets = this._ctx.cascade[entityName];
-                        if (cascadeTargets) {
-                            for (const childTable of cascadeTargets) {
-                                // Find FK from child → this parent via relationships
-                                const rel = this._ctx.relationships.find(
-                                    r => r.type === 'belongs-to' && r.from === childTable && r.to === entityName
-                                );
-                                if (rel) {
-                                    if (this._softDeletes) {
-                                        const now = new Date().toISOString();
-                                        this.db.query(`UPDATE "${childTable}" SET "deletedAt" = ? WHERE "${rel.foreignKey}" = ?`).run(now, id);
-                                    } else {
-                                        this.db.query(`DELETE FROM "${childTable}" WHERE "${rel.foreignKey}" = ?`).run(id);
+                            // Cascade delete children first
+                            const cascadeTargets = this._ctx.cascade[entityName];
+                            if (cascadeTargets) {
+                                for (const childTable of cascadeTargets) {
+                                    const rel = this._ctx.relationships.find(
+                                        r => r.type === 'belongs-to' && r.from === childTable && r.to === entityName
+                                    );
+                                    if (rel) {
+                                        if (this._softDeletes) {
+                                            const now = new Date().toISOString();
+                                            this._stmt(`UPDATE "${childTable}" SET "deletedAt" = ? WHERE "${rel.foreignKey}" = ?`).run(now, id);
+                                        } else {
+                                            this._stmt(`DELETE FROM "${childTable}" WHERE "${rel.foreignKey}" = ?`).run(id);
+                                        }
                                     }
                                 }
                             }
-                        }
 
-                        if (this._softDeletes) {
-                            const now = new Date().toISOString();
-                            this.db.query(`UPDATE "${entityName}" SET "deletedAt" = ? WHERE id = ?`).run(now, id);
-                            if (hooks?.afterDelete) hooks.afterDelete(id);
-                            return;
-                        }
-                        return deleteEntity(this._ctx, entityName, id);
+                            if (this._softDeletes) {
+                                const now = new Date().toISOString();
+                                this._stmt(`UPDATE "${entityName}" SET "deletedAt" = ? WHERE id = ?`).run(now, id);
+                                if (hooks?.afterDelete) hooks.afterDelete(id);
+                                return;
+                            }
+                            return deleteEntity(this._ctx, entityName, id);
+                        });
                     }
                     return createDeleteBuilder(this._ctx, entityName);
                 }) as any,
                 restore: ((id: number) => {
                     if (!this._softDeletes) throw new Error('restore() requires softDeletes: true');
-                    // debug log replaced by measure-fn instrumentation
-                    this.db.query(`UPDATE "${entityName}" SET "deletedAt" = NULL WHERE id = ?`).run(id);
+                    this._m(`${entityName}.restore(${id})`, () => {
+                        this._stmt(`UPDATE "${entityName}" SET "deletedAt" = NULL WHERE id = ?`).run(id);
+                    });
                 }) as any,
                 select: (...cols: string[]) => createQueryBuilder(this._ctx, entityName, cols),
-                count: () => {
-                    const row = this.db.query(`SELECT COUNT(*) as count FROM "${entityName}"${this._softDeletes ? ' WHERE "deletedAt" IS NULL' : ''}`).get() as any;
+                count: () => this._m(`${entityName}.count`, () => {
+                    const row = this._stmt(`SELECT COUNT(*) as count FROM "${entityName}"${this._softDeletes ? ' WHERE "deletedAt" IS NULL' : ''}`).get() as any;
                     return row?.count ?? 0;
-                },
+                }),
                 on: (event: ChangeEvent, callback: (row: any) => void | Promise<void>) => {
                     return this._registerListener(entityName, event, callback);
                 },
@@ -336,11 +353,11 @@ class _Database<Schemas extends SchemaMap> {
      */
     private _processChanges(): void {
         // Fast path: check if anything changed at all (single scalar, index-only)
-        const head = this.db.query('SELECT MAX(id) as m FROM "_changes"').get() as any;
+        const head = this._stmt('SELECT MAX(id) as m FROM "_changes"').get() as any;
         const maxId: number = head?.m ?? 0;
         if (maxId <= this._changeWatermark) return;
 
-        const changes = this.db.query(
+        const changes = this._stmt(
             'SELECT id, tbl, op, row_id FROM "_changes" WHERE id > ? ORDER BY id'
         ).all(this._changeWatermark) as { id: number; tbl: string; op: string; row_id: number }[];
 
@@ -371,7 +388,7 @@ class _Database<Schemas extends SchemaMap> {
         }
 
         // Clean up consumed changes
-        this.db.query('DELETE FROM "_changes" WHERE id <= ?').run(this._changeWatermark);
+        this._stmt('DELETE FROM "_changes" WHERE id <= ?').run(this._changeWatermark);
     }
 
     // =========================================================================
@@ -379,12 +396,13 @@ class _Database<Schemas extends SchemaMap> {
     // =========================================================================
 
     public transaction<T>(callback: () => T): T {
-        return this.db.transaction(callback)();
+        return this._m('transaction', () => this.db.transaction(callback)());
     }
 
-    /** Close the database: stops polling and releases the SQLite handle. */
+    /** Close the database: stops polling, clears cache, and releases the SQLite handle. */
     public close(): void {
         this._stopPolling();
+        this._stmtCache.clear();
         this.db.close();
     }
 
@@ -396,14 +414,13 @@ class _Database<Schemas extends SchemaMap> {
     public query<T extends Record<string, any> = Record<string, any>>(
         callback: (ctx: { [K in keyof Schemas]: ProxyColumns<InferSchema<Schemas[K]>> }) => ProxyQueryResult
     ): T[] {
-        return executeProxyQuery(
+        return this._m('query(proxy)', () => executeProxyQuery(
             this.schemas,
             callback as any,
             (sql: string, params: any[]) => {
-                if (this._debug) console.log('[satidb]', sql, params);
-                return this.db.query(sql).all(...params) as T[];
+                return this._stmt(sql).all(...params) as T[];
             },
-        );
+        ));
     }
 
     // =========================================================================
@@ -412,14 +429,12 @@ class _Database<Schemas extends SchemaMap> {
 
     /** Execute a raw SQL query and return results. */
     public raw<T = any>(sql: string, ...params: any[]): T[] {
-        if (this._debug) console.log('[satidb]', sql, params);
-        return this.db.query(sql).all(...params) as T[];
+        return this._m(`raw: ${sql.slice(0, 60)}`, () => this._stmt(sql).all(...params) as T[]);
     }
 
     /** Execute a raw SQL statement (INSERT/UPDATE/DELETE) without returning rows. */
     public exec(sql: string, ...params: any[]): void {
-        if (this._debug) console.log('[satidb]', sql, params);
-        this.db.run(sql, ...params);
+        this._m(`exec: ${sql.slice(0, 60)}`, () => this.db.run(sql, ...params));
     }
 
     // =========================================================================
@@ -445,11 +460,13 @@ class _Database<Schemas extends SchemaMap> {
      * Each key is a table name, value is an array of raw row objects.
      */
     public dump(): Record<string, any[]> {
-        const result: Record<string, any[]> = {};
-        for (const tableName of Object.keys(this.schemas)) {
-            result[tableName] = this.db.query(`SELECT * FROM "${tableName}"`).all();
-        }
-        return result;
+        return this._m('dump', () => {
+            const result: Record<string, any[]> = {};
+            for (const tableName of Object.keys(this.schemas)) {
+                result[tableName] = this.db.query(`SELECT * FROM "${tableName}"`).all();
+            }
+            return result;
+        });
     }
 
     /**
@@ -457,28 +474,29 @@ class _Database<Schemas extends SchemaMap> {
      * Use `{ append: true }` to insert without truncating.
      */
     public load(data: Record<string, any[]>, options?: { append?: boolean }): void {
-        const txn = this.db.transaction(() => {
-            for (const [tableName, rows] of Object.entries(data)) {
-                if (!this.schemas[tableName]) continue;
-                if (!options?.append) {
-                    this.db.run(`DELETE FROM "${tableName}"`);
-                }
-                for (const row of rows) {
-                    const cols = Object.keys(row).filter(k => k !== 'id');
-                    const placeholders = cols.map(() => '?').join(', ');
-                    const values = cols.map(c => {
-                        const v = row[c];
-                        // Auto-serialize objects/arrays
-                        if (v !== null && v !== undefined && typeof v === 'object' && !(v instanceof Buffer)) {
-                            return JSON.stringify(v);
-                        }
-                        return v;
-                    });
-                    this.db.query(`INSERT INTO "${tableName}" (${cols.map(c => `"${c}"`).join(', ')}) VALUES (${placeholders})`).run(...values);
+        this._m(`load(${Object.keys(data).join(',')})`, () => {
+            const txn = this.db.transaction(() => {
+                for (const [tableName, rows] of Object.entries(data)) {
+                    if (!this.schemas[tableName]) continue;
+                    if (!options?.append) {
+                        this.db.run(`DELETE FROM "${tableName}"`);
+                    }
+                    for (const row of rows) {
+                        const cols = Object.keys(row).filter(k => k !== 'id');
+                        const placeholders = cols.map(() => '?').join(', ');
+                        const values = cols.map(c => {
+                            const v = row[c];
+                            if (v !== null && v !== undefined && typeof v === 'object' && !(v instanceof Buffer)) {
+                                return JSON.stringify(v);
+                            }
+                            return v;
+                        });
+                        this.db.query(`INSERT INTO "${tableName}" (${cols.map(c => `"${c}"`).join(', ')}) VALUES (${placeholders})`).run(...values);
+                    }
                 }
-            }
+            });
+            txn();
         });
-        txn();
     }
 
     /**
@@ -498,45 +516,45 @@ class _Database<Schemas extends SchemaMap> {
      * Returns a diff object per table: { added, removed, typeChanged }.
      */
     public diff(): Record<string, { added: string[]; removed: string[]; typeChanged: { column: string; expected: string; actual: string }[] }> {
-        const result: Record<string, { added: string[]; removed: string[]; typeChanged: { column: string; expected: string; actual: string }[] }> = {};
-        const systemCols = new Set(['id', 'createdAt', 'updatedAt', 'deletedAt']);
-
-        for (const [tableName, schema] of Object.entries(this.schemas)) {
-            const schemaFields = getStorableFields(schema);
-            const schemaColMap = new Map(schemaFields.map(f => [f.name, zodTypeToSqlType(f.type)]));
-
-            const liveColumns = this.columns(tableName);
-            const liveColMap = new Map(liveColumns.map(c => [c.name, c.type]));
-
-            const added: string[] = [];
-            const removed: string[] = [];
-            const typeChanged: { column: string; expected: string; actual: string }[] = [];
-
-            // Columns in schema but not in live DB
-            for (const [col, expectedType] of schemaColMap) {
-                if (!liveColMap.has(col)) {
-                    added.push(col);
-                } else {
-                    const actualType = liveColMap.get(col)!;
-                    if (actualType !== expectedType) {
-                        typeChanged.push({ column: col, expected: expectedType, actual: actualType });
+        return this._m('diff', () => {
+            const result: Record<string, { added: string[]; removed: string[]; typeChanged: { column: string; expected: string; actual: string }[] }> = {};
+            const systemCols = new Set(['id', 'createdAt', 'updatedAt', 'deletedAt']);
+
+            for (const [tableName, schema] of Object.entries(this.schemas)) {
+                const schemaFields = getStorableFields(schema);
+                const schemaColMap = new Map(schemaFields.map(f => [f.name, zodTypeToSqlType(f.type)]));
+
+                const liveColumns = this.columns(tableName);
+                const liveColMap = new Map(liveColumns.map(c => [c.name, c.type]));
+
+                const added: string[] = [];
+                const removed: string[] = [];
+                const typeChanged: { column: string; expected: string; actual: string }[] = [];
+
+                for (const [col, expectedType] of schemaColMap) {
+                    if (!liveColMap.has(col)) {
+                        added.push(col);
+                    } else {
+                        const actualType = liveColMap.get(col)!;
+                        if (actualType !== expectedType) {
+                            typeChanged.push({ column: col, expected: expectedType, actual: actualType });
+                        }
                     }
                 }
-            }
 
-            // Columns in live DB but not in schema (excluding system columns)
-            for (const col of liveColMap.keys()) {
-                if (!systemCols.has(col) && !schemaColMap.has(col)) {
-                    removed.push(col);
+                for (const col of liveColMap.keys()) {
+                    if (!systemCols.has(col) && !schemaColMap.has(col)) {
+                        removed.push(col);
+                    }
                 }
-            }
 
-            if (added.length > 0 || removed.length > 0 || typeChanged.length > 0) {
-                result[tableName] = { added, removed, typeChanged };
+                if (added.length > 0 || removed.length > 0 || typeChanged.length > 0) {
+                    result[tableName] = { added, removed, typeChanged };
+                }
             }
-        }
 
-        return result;
+            return result;
+        });
     }
 }
 

package/src/query.ts

@@ -39,10 +39,11 @@ export function createQueryBuilder(ctx: DatabaseContext, entityName: string, ini
     const schema = ctx.schemas[entityName]!;
 
     const executor = (sql: string, params: any[], raw: boolean): any[] => {
-        if (ctx.debug) console.log('[satidb]', sql, params);
-        const rows = ctx.db.query(sql).all(...params);
-        if (raw) return rows;
-        return rows.map((row: any) => ctx.attachMethods(entityName, transformFromStorage(row, schema)));
+        return ctx._m(`SQL: ${sql.slice(0, 60)}`, () => {
+            const rows = ctx._stmt(sql).all(...params);
+            if (raw) return rows;
+            return rows.map((row: any) => ctx.attachMethods(entityName, transformFromStorage(row, schema)));
+        });
     };
 
     const singleExecutor = (sql: string, params: any[], raw: boolean): any | null => {
@@ -102,7 +103,7 @@ export function createQueryBuilder(ctx: DatabaseContext, entityName: string, ini
             if (belongsTo) {
                 const fk = belongsTo.foreignKey;
                 const placeholders = parentIds.map(() => '?').join(', ');
-                const childRows = ctx.db.query(
+                const childRows = ctx._stmt(
                     `SELECT * FROM ${hasMany.to} WHERE ${fk} IN (${placeholders})`
                 ).all(...parentIds) as any[];