flint-orm 0.3.0 → 0.4.1

package/dist/index.js

@@ -1,7 +1,4 @@
 // @bun
-// src/flint.ts
-import { Database } from "bun:sqlite";
-
 // src/query/conditions.ts
 function isColumnDef(value) {
   return value !== null && typeof value === "object" && "__internal" in value;
@@ -142,9 +139,6 @@ class FlintQueryError extends FlintError {
 }
 
 // src/query/builder.ts
-function bind(params) {
-  return params;
-}
 function getCol(tbl, key) {
   const col = tbl[key];
   if (!col)
@@ -152,7 +146,7 @@ function getCol(tbl, key) {
   return col;
 }
 function columnEntries(tbl) {
-  return Object.entries(tbl).filter(([k]) => k !== "_");
+  return Object.entries(tbl).filter(([k]) => k !== "_" && k !== "__indexes");
 }
 function decodeRow(raw, tbl) {
   const out = {};
@@ -231,19 +225,19 @@ function resolveColumns(table, selectedColumns, prefix) {
 }
 
 class SelectFromBuilder {
-  #client;
+  #executor;
   #conditions;
-  constructor(client, conditions = []) {
-    this.#client = client;
+  constructor(executor, conditions = []) {
+    this.#executor = executor;
     this.#conditions = conditions;
   }
   from(table) {
-    return new SelectBuilder(this.#client, table._.name, table, this.#conditions);
+    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
   }
 }
 
 class SelectBuilder {
-  #client;
+  #executor;
   #tableName;
   #table;
   #conditions;
@@ -252,8 +246,8 @@ class SelectBuilder {
   #limitValue;
   #offsetValue;
   #distinct;
-  constructor(client, tableName, table, conditions = [], selectedColumns = null, orderByClauses = [], limitValue = null, offsetValue = null, distinct = false) {
-    this.#client = client;
+  constructor(executor, tableName, table, conditions = [], selectedColumns = null, orderByClauses = [], limitValue = null, offsetValue = null, distinct = false) {
+    this.#executor = executor;
     this.#tableName = tableName;
     this.#table = table;
     this.#conditions = conditions;
@@ -264,26 +258,26 @@ class SelectBuilder {
     this.#distinct = distinct;
   }
   where(condition) {
-    return new SelectBuilder(this.#client, this.#tableName, this.#table, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#limitValue, this.#offsetValue, this.#distinct);
+    return new SelectBuilder(this.#executor, this.#tableName, this.#table, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#limitValue, this.#offsetValue, this.#distinct);
   }
   columns(keys) {
-    return new NarrowedSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, keys, this.#orderByClauses, this.#limitValue, this.#offsetValue, this.#distinct);
+    return new NarrowedSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, keys, this.#orderByClauses, this.#limitValue, this.#offsetValue, this.#distinct);
   }
   single() {
-    return new SingleSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#offsetValue, this.#distinct);
+    return new SingleSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#offsetValue, this.#distinct);
   }
   distinct() {
-    return new SelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, this.#offsetValue, true);
+    return new SelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, this.#offsetValue, true);
   }
   orderBy(key, direction = "asc") {
     const column = getCol(this.#table, key);
-    return new SelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#limitValue, this.#offsetValue, this.#distinct);
+    return new SelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#limitValue, this.#offsetValue, this.#distinct);
   }
   limit(n) {
-    return new SelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#offsetValue, this.#distinct);
+    return new SelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#offsetValue, this.#distinct);
   }
   offset(n) {
-    return new SelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, n, this.#distinct);
+    return new SelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, n, this.#distinct);
   }
   toSQL() {
     validateColumnOwnership(this.#conditions, [this.#table], `SELECT from "${this.#tableName}"`);
@@ -304,14 +298,15 @@ class SelectBuilder {
       sql += ` OFFSET ${this.#offsetValue}`;
     return { sql, params };
   }
-  execute() {
+  async execute() {
     const { sql, params } = this.toSQL();
     try {
-      const rows = this.#client.prepare(sql).all(...bind(params));
+      const rows = await this.#executor.all(sql, params);
+      const records = rows;
       if (this.#selectedColumns) {
-        return rows.map((r) => decodeSelectedRow(r, this.#table, this.#selectedColumns));
+        return records.map((r) => decodeSelectedRow(r, this.#table, this.#selectedColumns));
       }
-      return rows.map((r) => decodeRow(r, this.#table));
+      return records.map((r) => decodeRow(r, this.#table));
     } catch (e) {
       throw new FlintQueryError(`Failed to execute query: ${sql}`, e);
     }
@@ -319,7 +314,7 @@ class SelectBuilder {
 }
 
 class NarrowedSelectBuilder {
-  #client;
+  #executor;
   #tableName;
   #table;
   #conditions;
@@ -328,8 +323,8 @@ class NarrowedSelectBuilder {
   #limitValue;
   #offsetValue;
   #distinct;
-  constructor(client, tableName, table, conditions, selectedColumns, orderByClauses, limitValue, offsetValue, distinct) {
-    this.#client = client;
+  constructor(executor, tableName, table, conditions, selectedColumns, orderByClauses, limitValue, offsetValue, distinct) {
+    this.#executor = executor;
     this.#tableName = tableName;
     this.#table = table;
     this.#conditions = conditions;
@@ -340,23 +335,23 @@ class NarrowedSelectBuilder {
     this.#distinct = distinct;
   }
   where(condition) {
-    return new NarrowedSelectBuilder(this.#client, this.#tableName, this.#table, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#limitValue, this.#offsetValue, this.#distinct);
+    return new NarrowedSelectBuilder(this.#executor, this.#tableName, this.#table, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#limitValue, this.#offsetValue, this.#distinct);
   }
   distinct() {
-    return new NarrowedSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, this.#offsetValue, true);
+    return new NarrowedSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, this.#offsetValue, true);
   }
   single() {
-    return new NarrowedSingleSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#offsetValue, this.#distinct);
+    return new NarrowedSingleSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#offsetValue, this.#distinct);
   }
   orderBy(key, direction = "asc") {
     const column = getCol(this.#table, key);
-    return new NarrowedSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#limitValue, this.#offsetValue, this.#distinct);
+    return new NarrowedSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#limitValue, this.#offsetValue, this.#distinct);
   }
   limit(n) {
-    return new NarrowedSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#offsetValue, this.#distinct);
+    return new NarrowedSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#offsetValue, this.#distinct);
   }
   offset(n) {
-    return new NarrowedSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, n, this.#distinct);
+    return new NarrowedSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, n, this.#distinct);
   }
   toSQL() {
     validateColumnOwnership(this.#conditions, [this.#table], `SELECT from "${this.#tableName}"`);
@@ -377,10 +372,10 @@ class NarrowedSelectBuilder {
       sql += ` OFFSET ${this.#offsetValue}`;
     return { sql, params };
   }
-  execute() {
+  async execute() {
     const { sql, params } = this.toSQL();
     try {
-      const rows = this.#client.prepare(sql).all(...bind(params));
+      const rows = await this.#executor.all(sql, params);
       return rows.map((r) => decodeSelectedRow(r, this.#table, this.#selectedColumns));
     } catch (e) {
       throw new FlintQueryError(`Failed to execute query: ${sql}`, e);
@@ -389,7 +384,7 @@ class NarrowedSelectBuilder {
 }
 
 class SingleSelectBuilder {
-  #client;
+  #executor;
   #tableName;
   #table;
   #conditions;
@@ -397,8 +392,8 @@ class SingleSelectBuilder {
   #orderByClauses;
   #offsetValue;
   #distinct;
-  constructor(client, tableName, table, conditions, selectedColumns = null, orderByClauses = [], offsetValue = null, distinct = false) {
-    this.#client = client;
+  constructor(executor, tableName, table, conditions, selectedColumns = null, orderByClauses = [], offsetValue = null, distinct = false) {
+    this.#executor = executor;
     this.#tableName = tableName;
     this.#table = table;
     this.#conditions = conditions;
@@ -408,14 +403,14 @@ class SingleSelectBuilder {
     this.#distinct = distinct;
   }
   where(condition) {
-    return new SingleSelectBuilder(this.#client, this.#tableName, this.#table, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#offsetValue, this.#distinct);
+    return new SingleSelectBuilder(this.#executor, this.#tableName, this.#table, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#offsetValue, this.#distinct);
   }
   orderBy(key, direction = "asc") {
     const column = getCol(this.#table, key);
-    return new SingleSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#offsetValue, this.#distinct);
+    return new SingleSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#offsetValue, this.#distinct);
   }
   offset(n) {
-    return new SingleSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#distinct);
+    return new SingleSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#distinct);
   }
   toSQL() {
     validateColumnOwnership(this.#conditions, [this.#table], `SELECT from "${this.#tableName}"`);
@@ -435,16 +430,17 @@ class SingleSelectBuilder {
       sql += ` OFFSET ${this.#offsetValue}`;
     return { sql, params };
   }
-  execute() {
+  async execute() {
     const { sql, params } = this.toSQL();
     try {
-      const row = this.#client.prepare(sql).get(...bind(params));
+      const row = await this.#executor.get(sql, params);
       if (!row)
         return null;
+      const record = row;
       if (this.#selectedColumns) {
-        return decodeSelectedRow(row, this.#table, this.#selectedColumns);
+        return decodeSelectedRow(record, this.#table, this.#selectedColumns);
       }
-      return decodeRow(row, this.#table);
+      return decodeRow(record, this.#table);
     } catch (e) {
       throw new FlintQueryError(`Failed to execute query: ${sql}`, e);
     }
@@ -452,7 +448,7 @@ class SingleSelectBuilder {
 }
 
 class NarrowedSingleSelectBuilder {
-  #client;
+  #executor;
   #tableName;
   #table;
   #conditions;
@@ -460,8 +456,8 @@ class NarrowedSingleSelectBuilder {
   #orderByClauses;
   #offsetValue;
   #distinct;
-  constructor(client, tableName, table, conditions, selectedColumns, orderByClauses, offsetValue, distinct) {
-    this.#client = client;
+  constructor(executor, tableName, table, conditions, selectedColumns, orderByClauses, offsetValue, distinct) {
+    this.#executor = executor;
     this.#tableName = tableName;
     this.#table = table;
     this.#conditions = conditions;
@@ -471,14 +467,14 @@ class NarrowedSingleSelectBuilder {
     this.#distinct = distinct;
   }
   where(condition) {
-    return new NarrowedSingleSelectBuilder(this.#client, this.#tableName, this.#table, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#offsetValue, this.#distinct);
+    return new NarrowedSingleSelectBuilder(this.#executor, this.#tableName, this.#table, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#offsetValue, this.#distinct);
   }
   orderBy(key, direction = "asc") {
     const column = getCol(this.#table, key);
-    return new NarrowedSingleSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#offsetValue, this.#distinct);
+    return new NarrowedSingleSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#offsetValue, this.#distinct);
   }
   offset(n) {
-    return new NarrowedSingleSelectBuilder(this.#client, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#distinct);
+    return new NarrowedSingleSelectBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#distinct);
   }
   toSQL() {
     validateColumnOwnership(this.#conditions, [this.#table], `SELECT from "${this.#tableName}"`);
@@ -498,10 +494,10 @@ class NarrowedSingleSelectBuilder {
       sql += ` OFFSET ${this.#offsetValue}`;
     return { sql, params };
   }
-  execute() {
+  async execute() {
     const { sql, params } = this.toSQL();
     try {
-      const row = this.#client.prepare(sql).get(...bind(params));
+      const row = await this.#executor.get(sql, params);
       if (!row)
         return null;
       return decodeSelectedRow(row, this.#table, this.#selectedColumns);
@@ -512,12 +508,12 @@ class NarrowedSingleSelectBuilder {
 }
 
 class JoinStage1 {
-  #client;
+  #executor;
   #parent;
   #parentName;
   #joinType;
-  constructor(client, parent, parentName, joinType) {
-    this.#client = client;
+  constructor(executor, parent, parentName, joinType) {
+    this.#executor = executor;
     this.#parent = parent;
     this.#parentName = parentName;
     this.#joinType = joinType;
@@ -525,12 +521,12 @@ class JoinStage1 {
   on(child, condition) {
     const childName = child._.name;
     const resolvedCondition = condition ?? resolveForeignKeyCondition(this.#parent, this.#parentName, child, childName);
-    return new JoinBuilderImpl(this.#client, this.#parent, this.#parentName, [{ table: child, name: childName, condition: resolvedCondition }], this.#joinType);
+    return new JoinBuilderImpl(this.#executor, this.#parent, this.#parentName, [{ table: child, name: childName, condition: resolvedCondition }], this.#joinType);
   }
 }
 
 class JoinBuilderImpl {
-  #client;
+  #executor;
   #parent;
   #parentName;
   #joins;
@@ -540,8 +536,8 @@ class JoinBuilderImpl {
   #orderByClauses;
   #limitValue;
   #offsetValue;
-  constructor(client, parent, parentName, joins, joinType, conditions = [], selectedColumns = null, orderByClauses = [], limitValue = null, offsetValue = null) {
-    this.#client = client;
+  constructor(executor, parent, parentName, joins, joinType, conditions = [], selectedColumns = null, orderByClauses = [], limitValue = null, offsetValue = null) {
+    this.#executor = executor;
     this.#parent = parent;
     this.#parentName = parentName;
     this.#joins = joins;
@@ -555,26 +551,26 @@ class JoinBuilderImpl {
   on(child, condition) {
     const childName = child._.name;
     const resolvedCondition = condition ?? resolveForeignKeyCondition(this.#parent, this.#parentName, child, childName);
-    return new JoinBuilderImpl(this.#client, this.#parent, this.#parentName, [...this.#joins, { table: child, name: childName, condition: resolvedCondition }], this.#joinType, this.#conditions, this.#selectedColumns);
+    return new JoinBuilderImpl(this.#executor, this.#parent, this.#parentName, [...this.#joins, { table: child, name: childName, condition: resolvedCondition }], this.#joinType, this.#conditions, this.#selectedColumns);
   }
   where(condition) {
-    return new JoinBuilderImpl(this.#client, this.#parent, this.#parentName, this.#joins, this.#joinType, [...this.#conditions, condition], this.#selectedColumns);
+    return new JoinBuilderImpl(this.#executor, this.#parent, this.#parentName, this.#joins, this.#joinType, [...this.#conditions, condition], this.#selectedColumns);
   }
   columns(keys) {
-    return new JoinBuilderImpl(this.#client, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, keys, this.#orderByClauses, this.#limitValue, this.#offsetValue);
+    return new JoinBuilderImpl(this.#executor, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, keys, this.#orderByClauses, this.#limitValue, this.#offsetValue);
   }
   orderBy(key, direction = "asc") {
     const column = getCol(this.#parent, key);
-    return new JoinBuilderImpl(this.#client, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#limitValue, this.#offsetValue);
+    return new JoinBuilderImpl(this.#executor, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#limitValue, this.#offsetValue);
   }
   limit(n) {
-    return new JoinBuilderImpl(this.#client, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#offsetValue);
+    return new JoinBuilderImpl(this.#executor, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, this.#orderByClauses, n, this.#offsetValue);
   }
   offset(n) {
-    return new JoinBuilderImpl(this.#client, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, n);
+    return new JoinBuilderImpl(this.#executor, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#limitValue, n);
   }
   single() {
-    return new SingleJoinBuilderImpl(this.#client, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#offsetValue);
+    return new SingleJoinBuilderImpl(this.#executor, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, this.#orderByClauses, this.#offsetValue);
   }
   toSQL() {
     const allowedTables = [this.#parent, ...this.#joins.map((j) => j.table)];
@@ -609,69 +605,72 @@ class JoinBuilderImpl {
       sql += ` OFFSET ${this.#offsetValue}`;
     return { sql, params: [...joinParams, ...whereParams] };
   }
-  execute() {
+  async execute() {
     const { sql, params } = this.toSQL();
     try {
-      const rows = this.#client.prepare(sql).all(...bind(params));
-      const parentEntries = columnEntries(this.#parent);
-      const pkKey = findPKKey(this.#parent);
-      const pkColName = getCol(this.#parent, pkKey).name;
-      const childEntryMaps = [];
-      for (const j of this.#joins) {
-        childEntryMaps.push({
-          name: j.name,
-          entries: columnEntries(j.table),
-          table: j.table
-        });
-      }
-      const grouped = new Map;
-      for (const row of rows) {
-        const pk = row[pkColName];
-        if (!grouped.has(pk)) {
-          const parentRow = {};
-          for (const [key, col] of parentEntries) {
-            parentRow[key] = row[col.name];
-          }
-          grouped.set(pk, {
-            parent: parentRow,
-            children: childEntryMaps.map(() => [])
-          });
-        }
-        const group = grouped.get(pk);
-        childEntryMaps.forEach((childMap, i) => {
-          const childRow = {};
-          let hasNonNullChild = false;
-          for (const [key, col] of childMap.entries) {
-            const val = row[`${childMap.name}_${col.name}`];
-            childRow[key] = val;
-            if (val != null)
-              hasNonNullChild = true;
-          }
-          if (this.#joinType === "left" && !hasNonNullChild)
-            return;
-          group.children[i].push(childRow);
-        });
-      }
-      const result = [];
-      for (const { parent, children } of grouped.values()) {
-        const decodedParent = this.#selectedColumns ? decodeSelectedRow(parent, this.#parent, this.#selectedColumns) : decodeRow(parent, this.#parent);
-        const nested = { ...decodedParent };
-        childEntryMaps.forEach((childMap, i) => {
-          nested[childMap.name] = children[i].map((c) => decodeRow(c, childMap.table));
-        });
-        result.push(nested);
-      }
-      return result;
+      const rows = await this.#executor.all(sql, params);
+      return this.#decodeJoinRows(rows);
     } catch (e) {
       if (e instanceof FlintQueryError)
         throw e;
       throw new FlintQueryError(`Failed to execute query: ${sql}`, e);
     }
   }
+  #decodeJoinRows(rows) {
+    const parentEntries = columnEntries(this.#parent);
+    const pkKey = findPKKey(this.#parent);
+    const pkColName = getCol(this.#parent, pkKey).name;
+    const childEntryMaps = [];
+    for (const j of this.#joins) {
+      childEntryMaps.push({
+        name: j.name,
+        entries: columnEntries(j.table),
+        table: j.table
+      });
+    }
+    const grouped = new Map;
+    for (const row of rows) {
+      const pk = row[pkColName];
+      if (!grouped.has(pk)) {
+        const parentRow = {};
+        for (const [key, col] of parentEntries) {
+          parentRow[key] = row[col.name];
+        }
+        grouped.set(pk, {
+          parent: parentRow,
+          children: childEntryMaps.map(() => [])
+        });
+      }
+      const group = grouped.get(pk);
+      childEntryMaps.forEach((childMap, i) => {
+        const childRow = {};
+        let hasNonNullChild = false;
+        for (const [key, col] of childMap.entries) {
+          const val = row[`${childMap.name}_${col.name}`];
+          childRow[key] = val;
+          if (val != null)
+            hasNonNullChild = true;
+        }
+        if (this.#joinType === "left" && !hasNonNullChild)
+          return;
+        group.children[i].push(childRow);
+      });
+    }
+    const result = [];
+    for (const { parent, children } of grouped.values()) {
+      const decodedParent = this.#selectedColumns ? decodeSelectedRow(parent, this.#parent, this.#selectedColumns) : decodeRow(parent, this.#parent);
+      const nested = { ...decodedParent };
+      childEntryMaps.forEach((childMap, i) => {
+        nested[childMap.name] = children[i].map((c) => decodeRow(c, childMap.table));
+      });
+      result.push(nested);
+    }
+    return result;
+  }
 }
 
 class SingleJoinBuilderImpl {
-  #client;
+  #executor;
   #parent;
   #parentName;
   #joins;
@@ -680,8 +679,8 @@ class SingleJoinBuilderImpl {
   #selectedColumns;
   #orderByClauses;
   #offsetValue;
-  constructor(client, parent, parentName, joins, joinType, conditions, selectedColumns = null, orderByClauses = [], offsetValue = null) {
-    this.#client = client;
+  constructor(executor, parent, parentName, joins, joinType, conditions, selectedColumns = null, orderByClauses = [], offsetValue = null) {
+    this.#executor = executor;
     this.#parent = parent;
     this.#parentName = parentName;
     this.#joins = joins;
@@ -692,14 +691,14 @@ class SingleJoinBuilderImpl {
     this.#offsetValue = offsetValue;
   }
   where(condition) {
-    return new SingleJoinBuilderImpl(this.#client, this.#parent, this.#parentName, this.#joins, this.#joinType, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#offsetValue);
+    return new SingleJoinBuilderImpl(this.#executor, this.#parent, this.#parentName, this.#joins, this.#joinType, [...this.#conditions, condition], this.#selectedColumns, this.#orderByClauses, this.#offsetValue);
   }
   orderBy(key, direction = "asc") {
     const column = getCol(this.#parent, key);
-    return new SingleJoinBuilderImpl(this.#client, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#offsetValue);
+    return new SingleJoinBuilderImpl(this.#executor, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, [...this.#orderByClauses, { column, direction }], this.#offsetValue);
   }
   offset(n) {
-    return new SingleJoinBuilderImpl(this.#client, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, this.#orderByClauses, n);
+    return new SingleJoinBuilderImpl(this.#executor, this.#parent, this.#parentName, this.#joins, this.#joinType, this.#conditions, this.#selectedColumns, this.#orderByClauses, n);
   }
   toSQL() {
     const allowedTables = [this.#parent, ...this.#joins.map((j) => j.table)];
@@ -733,91 +732,95 @@ class SingleJoinBuilderImpl {
       sql += ` OFFSET ${this.#offsetValue}`;
     return { sql, params: [...joinParams, ...whereParams] };
   }
-  execute() {
+  async execute() {
     const { sql, params } = this.toSQL();
     try {
-      const allRows = this.#client.prepare(sql).all(...bind(params));
-      if (allRows.length === 0)
+      const rows = await this.#executor.all(sql, params);
+      const records = rows;
+      if (records.length === 0)
         return null;
-      const parentEntries = columnEntries(this.#parent);
-      const pkKey = findPKKey(this.#parent);
-      const pkColName = getCol(this.#parent, pkKey).name;
-      const childEntryMaps = [];
-      for (const j of this.#joins) {
-        childEntryMaps.push({
-          name: j.name,
-          entries: columnEntries(j.table),
-          table: j.table
-        });
-      }
-      const grouped = new Map;
-      for (const r of allRows) {
-        const pk = r[pkColName];
-        if (!grouped.has(pk)) {
-          const parentRow = {};
-          for (const [key, col] of parentEntries) {
-            parentRow[key] = r[col.name];
-          }
-          grouped.set(pk, {
-            parent: parentRow,
-            children: childEntryMaps.map(() => [])
-          });
+      return this.#decodeJoinRow(records);
+    } catch (e) {
+      if (e instanceof FlintQueryError)
+        throw e;
+      throw new FlintQueryError(`Failed to execute query: ${sql}`, e);
+    }
+  }
+  #decodeJoinRow(rows) {
+    const parentEntries = columnEntries(this.#parent);
+    const pkKey = findPKKey(this.#parent);
+    const pkColName = getCol(this.#parent, pkKey).name;
+    const childEntryMaps = [];
+    for (const j of this.#joins) {
+      childEntryMaps.push({
+        name: j.name,
+        entries: columnEntries(j.table),
+        table: j.table
+      });
+    }
+    const grouped = new Map;
+    for (const r of rows) {
+      const pk = r[pkColName];
+      if (!grouped.has(pk)) {
+        const parentRow = {};
+        for (const [key, col] of parentEntries) {
+          parentRow[key] = r[col.name];
         }
-        const group = grouped.get(pk);
-        childEntryMaps.forEach((childMap, i) => {
-          const childRow = {};
-          let hasNonNullChild = false;
-          for (const [key, col] of childMap.entries) {
-            const val = r[`${childMap.name}_${col.name}`];
-            childRow[key] = val;
-            if (val != null)
-              hasNonNullChild = true;
-          }
-          if (this.#joinType === "left" && !hasNonNullChild)
-            return;
-          group.children[i].push(childRow);
+        grouped.set(pk, {
+          parent: parentRow,
+          children: childEntryMaps.map(() => [])
         });
       }
-      const first = grouped.values().next().value;
-      if (!first)
-        return null;
-      const decodedParent = this.#selectedColumns ? decodeSelectedRow(first.parent, this.#parent, this.#selectedColumns) : decodeRow(first.parent, this.#parent);
-      const nested = { ...decodedParent };
+      const group = grouped.get(pk);
       childEntryMaps.forEach((childMap, i) => {
-        nested[childMap.name] = first.children[i].map((c) => decodeRow(c, childMap.table));
+        const childRow = {};
+        let hasNonNullChild = false;
+        for (const [key, col] of childMap.entries) {
+          const val = r[`${childMap.name}_${col.name}`];
+          childRow[key] = val;
+          if (val != null)
+            hasNonNullChild = true;
+        }
+        if (this.#joinType === "left" && !hasNonNullChild)
+          return;
+        group.children[i].push(childRow);
       });
-      return nested;
-    } catch (e) {
-      if (e instanceof FlintQueryError)
-        throw e;
-      throw new FlintQueryError(`Failed to execute query: ${sql}`, e);
     }
+    const first = grouped.values().next().value;
+    if (!first)
+      return null;
+    const decodedParent = this.#selectedColumns ? decodeSelectedRow(first.parent, this.#parent, this.#selectedColumns) : decodeRow(first.parent, this.#parent);
+    const nested = { ...decodedParent };
+    childEntryMaps.forEach((childMap, i) => {
+      nested[childMap.name] = first.children[i].map((c) => decodeRow(c, childMap.table));
+    });
+    return nested;
   }
 }
 
 class InsertValuesBuilder {
-  #client;
+  #executor;
   #tableName;
   #table;
-  constructor(client, tableName, table) {
-    this.#client = client;
+  constructor(executor, tableName, table) {
+    this.#executor = executor;
     this.#tableName = tableName;
     this.#table = table;
   }
   values(rowOrRows) {
-    return new InsertBuilder(this.#client, this.#tableName, this.#table, rowOrRows);
+    return new InsertBuilder(this.#executor, this.#tableName, this.#table, rowOrRows);
   }
 }
 
 class InsertBuilder {
-  #client;
+  #executor;
   #tableName;
   #table;
   #rows;
   #returning;
   #onConflict;
-  constructor(client, tableName, table, rowOrRows, returning = false, onConflict) {
-    this.#client = client;
+  constructor(executor, tableName, table, rowOrRows, returning = false, onConflict) {
+    this.#executor = executor;
     this.#tableName = tableName;
     this.#table = table;
     this.#rows = Array.isArray(rowOrRows) ? rowOrRows : [rowOrRows];
@@ -825,13 +828,13 @@ class InsertBuilder {
     this.#onConflict = onConflict;
   }
   returning(keys) {
-    return new InsertBuilder(this.#client, this.#tableName, this.#table, this.#rows, keys ?? true, this.#onConflict);
+    return new InsertBuilder(this.#executor, this.#tableName, this.#table, this.#rows, keys ?? true, this.#onConflict);
   }
   onConflictDoNothing() {
-    return new InsertBuilder(this.#client, this.#tableName, this.#table, this.#rows, this.#returning, { mode: "nothing" });
+    return new InsertBuilder(this.#executor, this.#tableName, this.#table, this.#rows, this.#returning, { mode: "nothing" });
   }
   onConflictDoUpdate(options) {
-    return new InsertBuilder(this.#client, this.#tableName, this.#table, this.#rows, this.#returning, {
+    return new InsertBuilder(this.#executor, this.#tableName, this.#table, this.#rows, this.#returning, {
       mode: "update",
       target: options.target,
       set: options.set
@@ -900,17 +903,18 @@ class InsertBuilder {
     }
     return { sql, params };
   }
-  execute() {
+  async execute() {
     const { sql, params } = this.toSQL();
     try {
       if (this.#returning) {
-        const rows = this.#client.prepare(sql).all(...bind(params));
+        const rows = await this.#executor.all(sql, params);
+        const records = rows;
         if (Array.isArray(this.#returning)) {
-          return rows.map((r) => decodeSelectedRow(r, this.#table, this.#returning));
+          return records.map((r) => decodeSelectedRow(r, this.#table, this.#returning));
         }
-        return rows.map((r) => decodeRow(r, this.#table));
+        return records.map((r) => decodeRow(r, this.#table));
       }
-      this.#client.prepare(sql).run(...bind(params));
+      await this.#executor.run(sql, params);
       return;
     } catch (e) {
       throw new FlintQueryError(`Failed to execute query: ${sql}`, e);
@@ -919,28 +923,28 @@ class InsertBuilder {
 }
 
 class UpdateSetBuilder {
-  #client;
+  #executor;
   #tableName;
   #table;
-  constructor(client, tableName, table) {
-    this.#client = client;
+  constructor(executor, tableName, table) {
+    this.#executor = executor;
     this.#tableName = tableName;
     this.#table = table;
   }
   set(partial) {
-    return new UpdateBuilder(this.#client, this.#tableName, this.#table, partial);
+    return new UpdateBuilder(this.#executor, this.#tableName, this.#table, partial);
   }
 }
 
 class UpdateBuilder {
-  #client;
+  #executor;
   #tableName;
   #table;
   #set;
   #conditions;
   #returning;
-  constructor(client, tableName, table, set, conditions = [], returning = false) {
-    this.#client = client;
+  constructor(executor, tableName, table, set, conditions = [], returning = false) {
+    this.#executor = executor;
     this.#tableName = tableName;
     this.#table = table;
     this.#set = set;
@@ -948,13 +952,13 @@ class UpdateBuilder {
     this.#returning = returning;
   }
   set(partial) {
-    return new UpdateBuilder(this.#client, this.#tableName, this.#table, { ...this.#set, ...partial }, this.#conditions, this.#returning);
+    return new UpdateBuilder(this.#executor, this.#tableName, this.#table, { ...this.#set, ...partial }, this.#conditions, this.#returning);
   }
   where(condition) {
-    return new UpdateBuilder(this.#client, this.#tableName, this.#table, this.#set, [...this.#conditions, condition], this.#returning);
+    return new UpdateBuilder(this.#executor, this.#tableName, this.#table, this.#set, [...this.#conditions, condition], this.#returning);
   }
   returning(keys) {
-    return new UpdateBuilder(this.#client, this.#tableName, this.#table, this.#set, this.#conditions, keys ?? true);
+    return new UpdateBuilder(this.#executor, this.#tableName, this.#table, this.#set, this.#conditions, keys ?? true);
   }
   toSQL() {
     validateColumnOwnership(this.#conditions, [this.#table], `UPDATE "${this.#tableName}"`);
@@ -984,17 +988,18 @@ class UpdateBuilder {
     }
     return { sql, params };
   }
-  execute() {
+  async execute() {
     const { sql, params } = this.toSQL();
     try {
       if (this.#returning) {
-        const rows = this.#client.prepare(sql).all(...bind(params));
+        const rows = await this.#executor.all(sql, params);
+        const records = rows;
         if (Array.isArray(this.#returning)) {
-          return rows.map((r) => decodeSelectedRow(r, this.#table, this.#returning));
+          return records.map((r) => decodeSelectedRow(r, this.#table, this.#returning));
         }
-        return rows.map((r) => decodeRow(r, this.#table));
+        return records.map((r) => decodeRow(r, this.#table));
       }
-      this.#client.prepare(sql).run(...bind(params));
+      await this.#executor.run(sql, params);
       return;
     } catch (e) {
       throw new FlintQueryError(`Failed to execute query: ${sql}`, e);
@@ -1003,23 +1008,23 @@ class UpdateBuilder {
 }
 
 class DeleteBuilder {
-  #client;
+  #executor;
   #tableName;
   #table;
   #conditions;
   #returning;
-  constructor(client, tableName, table, conditions = [], returning = false) {
-    this.#client = client;
+  constructor(executor, tableName, table, conditions = [], returning = false) {
+    this.#executor = executor;
     this.#tableName = tableName;
     this.#table = table;
     this.#conditions = conditions;
     this.#returning = returning;
   }
   where(condition) {
-    return new DeleteBuilder(this.#client, this.#tableName, this.#table, [...this.#conditions, condition], this.#returning);
+    return new DeleteBuilder(this.#executor, this.#tableName, this.#table, [...this.#conditions, condition], this.#returning);
   }
   returning(keys) {
-    return new DeleteBuilder(this.#client, this.#tableName, this.#table, this.#conditions, keys ?? true);
+    return new DeleteBuilder(this.#executor, this.#tableName, this.#table, this.#conditions, keys ?? true);
   }
   toSQL() {
     validateColumnOwnership(this.#conditions, [this.#table], `DELETE from "${this.#tableName}"`);
@@ -1038,17 +1043,18 @@ class DeleteBuilder {
     }
     return { sql, params };
   }
-  execute() {
+  async execute() {
     const { sql, params } = this.toSQL();
     try {
       if (this.#returning) {
-        const rows = this.#client.prepare(sql).all(...bind(params));
+        const rows = await this.#executor.all(sql, params);
+        const records = rows;
         if (Array.isArray(this.#returning)) {
-          return rows.map((r) => decodeSelectedRow(r, this.#table, this.#returning));
+          return records.map((r) => decodeSelectedRow(r, this.#table, this.#returning));
         }
-        return rows.map((r) => decodeRow(r, this.#table));
+        return records.map((r) => decodeRow(r, this.#table));
       }
-      this.#client.prepare(sql).run(...bind(params));
+      await this.#executor.run(sql, params);
       return;
     } catch (e) {
       throw new FlintQueryError(`Failed to execute query: ${sql}`, e);
@@ -1071,83 +1077,81 @@ function compileWhere(condition) {
   const whereSql = compileCondition(condition, params);
   return { whereSql: ` WHERE ${whereSql}`, params };
 }
-function count(client, table, condition) {
+async function count(executor, table, condition) {
   const tableName = getTableName(table);
   const { whereSql, params } = compileWhere(condition);
   const sql = `SELECT count(*) as cnt FROM ${tableName}${whereSql}`;
-  const result = client.prepare(sql).get(...params);
+  const result = await executor.get(sql, params);
   return result.cnt;
 }
-function countColumn(client, table, column, condition) {
+async function countColumn(executor, table, column, condition) {
   const tableName = getTableName(table);
   const columnName = getColumnName(column);
   const { whereSql, params } = compileWhere(condition);
   const sql = `SELECT count(${columnName}) as cnt FROM ${tableName}${whereSql}`;
-  const result = client.prepare(sql).get(...params);
+  const result = await executor.get(sql, params);
   return result.cnt;
 }
-function sum(client, table, column, condition) {
+async function sum(executor, table, column, condition) {
   const tableName = getTableName(table);
   const columnName = getColumnName(column);
   const { whereSql, params } = compileWhere(condition);
   const sql = `SELECT sum(${columnName}) as total FROM ${tableName}${whereSql}`;
-  const result = client.prepare(sql).get(...params);
+  const result = await executor.get(sql, params);
   return result.total;
 }
-function avg(client, table, column, condition) {
+async function avg(executor, table, column, condition) {
   const tableName = getTableName(table);
   const columnName = getColumnName(column);
   const { whereSql, params } = compileWhere(condition);
   const sql = `SELECT avg(${columnName}) as average FROM ${tableName}${whereSql}`;
-  const result = client.prepare(sql).get(...params);
+  const result = await executor.get(sql, params);
   return result.average;
 }
-function min(client, table, column, condition) {
+async function min(executor, table, column, condition) {
   const tableName = getTableName(table);
   const columnName = getColumnName(column);
   const { whereSql, params } = compileWhere(condition);
   const sql = `SELECT min(${columnName}) as minimum FROM ${tableName}${whereSql}`;
-  const result = client.prepare(sql).get(...params);
+  const result = await executor.get(sql, params);
   return result.minimum;
 }
-function max(client, table, column, condition) {
+async function max(executor, table, column, condition) {
   const tableName = getTableName(table);
   const columnName = getColumnName(column);
   const { whereSql, params } = compileWhere(condition);
   const sql = `SELECT max(${columnName}) as maximum FROM ${tableName}${whereSql}`;
-  const result = client.prepare(sql).get(...params);
+  const result = await executor.get(sql, params);
   return result.maximum;
 }
 
 // src/flint.ts
-function flint(details) {
-  const client = new Database(details.url);
+function createClient(executor) {
   return {
-    select: () => new SelectFromBuilder(client),
-    insert: (table) => new InsertValuesBuilder(client, table._.name, table),
-    update: (table) => new UpdateSetBuilder(client, table._.name, table),
-    delete: (table) => new DeleteBuilder(client, table._.name, table),
-    leftJoin: (parent) => new JoinStage1(client, parent, parent._.name, "left"),
-    innerJoin: (parent) => new JoinStage1(client, parent, parent._.name, "inner"),
+    select: () => new SelectFromBuilder(executor),
+    insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
+    update: (table) => new UpdateSetBuilder(executor, table._.name, table),
+    delete: (table) => new DeleteBuilder(executor, table._.name, table),
+    leftJoin: (parent) => new JoinStage1(executor, parent, parent._.name, "left"),
+    innerJoin: (parent) => new JoinStage1(executor, parent, parent._.name, "inner"),
     batch: (queries) => {
       const stmts = queries.map((q) => q.toSQL());
-      const tx = client.transaction(() => {
-        for (const { sql: query, params } of stmts) {
-          client.prepare(query).run(...params);
+      return executor.transaction(async () => {
+        for (const stmt of stmts) {
+          await executor.run(stmt.sql, stmt.params);
         }
       });
-      tx();
     },
-    count: (table, condition) => count(client, table, condition),
-    countColumn: (table, column, condition) => countColumn(client, table, column, condition),
-    sum: (table, column, condition) => sum(client, table, column, condition),
-    avg: (table, column, condition) => avg(client, table, column, condition),
-    min: (table, column, condition) => min(client, table, column, condition),
-    max: (table, column, condition) => max(client, table, column, condition),
-    $run(sql, ...params) {
-      return client.prepare(sql).run(...params);
+    count: (table, condition) => count(executor, table, condition),
+    countColumn: (table, column, condition) => countColumn(executor, table, column, condition),
+    sum: (table, column, condition) => sum(executor, table, column, condition),
+    avg: (table, column, condition) => avg(executor, table, column, condition),
+    min: (table, column, condition) => min(executor, table, column, condition),
+    max: (table, column, condition) => max(executor, table, column, condition),
+    $run(query, ...params) {
+      return executor.run(query, params);
     },
-    $client: client
+    $executor: executor
   };
 }
 function sql(strings, ...values) {
@@ -1183,6 +1187,8 @@ function makeColumn(config) {
       hasOnUpdate: false,
       referencesTable: null,
       referencesColumn: null,
+      onDelete: null,
+      onUpdate: null,
       encode: config.encode,
       decode: config.decode,
       tableName: null
@@ -1214,6 +1220,12 @@ function makeColumn(config) {
           referencesColumn: target.name
         }
       };
+    },
+    onDelete(action) {
+      return { ...this, __internal: { ...this.__internal, onDelete: action } };
+    },
+    onUpdate(action) {
+      return { ...this, __internal: { ...this.__internal, onUpdate: action } };
     }
   };
   return col;
@@ -1317,7 +1329,7 @@ function date(name) {
     defaultNow() {
       return { ...this, __internal: { ...this.__internal, hasDefaultNow: true } };
     },
-    onUpdate() {
+    onUpdateTimestamp() {
       return { ...this, __internal: { ...this.__internal, hasOnUpdate: true } };
     }
   };
@@ -1367,6 +1379,12 @@ function table(name, columns, indexFn) {
             referencesColumn: target.name
           }
         };
+      },
+      onDelete(action) {
+        return { ...this, __internal: { ...stampedInternal, onDelete: action } };
+      },
+      onUpdate(action) {
+        return { ...this, __internal: { ...stampedInternal, onUpdate: action } };
       }
     };
     if ("autoIncrement" in col) {
@@ -1379,8 +1397,8 @@ function table(name, columns, indexFn) {
         return { ...this, __internal: { ...stampedInternal, hasDefaultNow: true } };
       };
     }
-    if ("onUpdate" in col) {
-      stampedCol.onUpdate = function() {
+    if ("onUpdateTimestamp" in col) {
+      stampedCol.onUpdateTimestamp = function() {
         return { ...this, __internal: { ...stampedInternal, hasOnUpdate: true } };
       };
     }
@@ -1437,6 +1455,12 @@ function snakeCaseTable(tableName, columns, indexFn) {
             referencesColumn: target.name
           }
         };
+      },
+      onDelete(action) {
+        return { ...this, __internal: { ...stampedInternal, onDelete: action } };
+      },
+      onUpdate(action) {
+        return { ...this, __internal: { ...stampedInternal, onUpdate: action } };
       }
     };
     if ("autoIncrement" in col) {
@@ -1449,8 +1473,8 @@ function snakeCaseTable(tableName, columns, indexFn) {
         return { ...this, __internal: { ...stampedInternal, hasDefaultNow: true } };
       };
     }
-    if ("onUpdate" in col) {
-      stampedCol.onUpdate = function() {
+    if ("onUpdateTimestamp" in col) {
+      stampedCol.onUpdateTimestamp = function() {
         return { ...this, __internal: { ...stampedInternal, hasOnUpdate: true } };
       };
     }
@@ -1528,7 +1552,12 @@ function introspectColumns(client, tableName) {
   const indexRows = client.query(`PRAGMA index_list('${tableName}')`).all();
   const fkMap = new Map;
   for (const fk of fkRows) {
-    fkMap.set(fk.from, { referencesTable: fk.table, referencesColumn: fk.to });
+    fkMap.set(fk.from, {
+      referencesTable: fk.table,
+      referencesColumn: fk.to,
+      onDelete: fk.on_delete !== "NO ACTION" ? fk.on_delete.toLowerCase() : undefined,
+      onUpdate: fk.on_update !== "NO ACTION" ? fk.on_update.toLowerCase() : undefined
+    });
   }
   const uniqueColumns = new Set;
   for (const idx of indexRows) {
@@ -1554,6 +1583,10 @@ function introspectColumns(client, tableName) {
     if (fk) {
       col.referencesTable = fk.referencesTable;
       col.referencesColumn = fk.referencesColumn;
+      if (fk.onDelete)
+        col.onDelete = fk.onDelete;
+      if (fk.onUpdate)
+        col.onUpdate = fk.onUpdate;
     }
     return col;
   });
@@ -1616,9 +1649,9 @@ export {
   gte,
   gt,
   glob,
-  flint,
   eq,
   date,
+  createClient,
   countColumn,
   count,
   boolean,