@remix-run/data-table-sqlite 0.3.0 → 0.4.1

package/README.md

@@ -1,11 +1,11 @@
 # data-table-sqlite
 
 SQLite adapter for [`remix/data-table`](https://github.com/remix-run/remix/tree/main/packages/data-table).
-Use this package when you want `data-table` APIs backed by `better-sqlite3`.
+Use this package when you want `data-table` APIs backed by a synchronous SQLite client.
 
 ## Features
 
-- **Native `better-sqlite3` Integration**: Works well for local and embedded deployments
+- **Native Runtime SQLite Support**: Works with Node's `node:sqlite` `DatabaseSync`, Bun's `bun:sqlite` `Database`, and compatible synchronous SQLite clients
 - **Full `data-table` API Support**: Queries, relations, writes, and transactions
 - **Adapter-Owned Compiler**: SQL compilation lives in this adapter, with optional shared pure helpers from `data-table`
 - **Migration DDL Support**: Compiles and executes `DataMigrationOperation` operations for `remix/data-table/migrations`
@@ -19,13 +19,26 @@ Use this package when you want `data-table` APIs backed by `better-sqlite3`.
 ## Installation
 
 ```sh
-npm i remix better-sqlite3
+npm i remix
 ```
 
 ## Usage
 
+### Node
+
+```ts
+import { DatabaseSync } from 'node:sqlite'
+import { createDatabase } from 'remix/data-table'
+import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
+
+let sqlite = new DatabaseSync('app.db')
+let db = createDatabase(createSqliteDatabaseAdapter(sqlite))
+```
+
+### Bun
+
 ```ts
-import Database from 'better-sqlite3'
+import { Database } from 'bun:sqlite'
 import { createDatabase } from 'remix/data-table'
 import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
 
@@ -34,7 +47,7 @@ let db = createDatabase(createSqliteDatabaseAdapter(sqlite))
 ```
 
 This is a good fit for local development, embedded deployments, and single-node services.
-Import any driver-specific types you need directly from `better-sqlite3`.
+Import any driver-specific types you need directly from your runtime's SQLite module.
 
 ## Adapter Capabilities
 
@@ -51,11 +64,11 @@ Import any driver-specific types you need directly from `better-sqlite3`.
 ### In-Memory Database For Tests
 
 ```ts
-import Database from 'better-sqlite3'
+import { DatabaseSync } from 'node:sqlite'
 import { createDatabase } from 'remix/data-table'
 import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
 
-let sqlite = new Database(':memory:')
+let sqlite = new DatabaseSync(':memory:')
 let db = createDatabase(createSqliteDatabaseAdapter(sqlite))
 ```
 

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { createSqliteDatabaseAdapter, SqliteDatabaseAdapter } from './lib/adapter.ts';
+export type { SqliteDatabase, SqliteRunResult, SqliteStatement } from './lib/adapter.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AACrF,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA"}

package/dist/lib/adapter.d.ts

@@ -1,7 +1,34 @@
 import type { DataManipulationRequest, DataMigrationRequest, DataMigrationResult, DataMigrationOperation, DataManipulationResult, DataManipulationOperation, DatabaseAdapter, SqlStatement, TableRef, TransactionOptions, TransactionToken } from '@remix-run/data-table';
-import type { Database as BetterSqliteDatabase } from 'better-sqlite3';
 /**
- * `DatabaseAdapter` implementation for Better SQLite3.
+ * Synchronous SQLite database client accepted by the sqlite adapter.
+ *
+ * This matches the shared surface of Node's `node:sqlite` `DatabaseSync`, Bun's `bun:sqlite`
+ * `Database`, and compatible synchronous SQLite clients.
+ */
+export interface SqliteDatabase {
+    prepare(sql: string): SqliteStatement;
+    exec(sql: string): unknown;
+}
+/**
+ * Prepared statement shape used by {@link SqliteDatabase}.
+ */
+export interface SqliteStatement {
+    all(...values: unknown[]): unknown[];
+    get(...values: unknown[]): unknown;
+    run(...values: unknown[]): SqliteRunResult;
+    reader?: boolean;
+    columns?: () => unknown[];
+    columnNames?: string[];
+}
+/**
+ * SQLite write execution metadata.
+ */
+export interface SqliteRunResult {
+    changes: number | bigint;
+    lastInsertRowid: unknown;
+}
+/**
+ * `DatabaseAdapter` implementation for synchronous SQLite clients.
  */
 export declare class SqliteDatabaseAdapter implements DatabaseAdapter {
     #private;
@@ -19,7 +46,7 @@ export declare class SqliteDatabaseAdapter implements DatabaseAdapter {
         transactionalDdl: boolean;
         migrationLock: boolean;
     };
-    constructor(database: BetterSqliteDatabase);
+    constructor(database: SqliteDatabase);
     /**
      * Compiles a data or migration operation to sqlite SQL statements.
      * @param operation Operation to compile.
@@ -95,19 +122,18 @@ export declare class SqliteDatabaseAdapter implements DatabaseAdapter {
 }
 /**
  * Creates a sqlite `DatabaseAdapter`.
- * @param database Better SQLite3 database instance.
- * @param options Optional adapter capability overrides.
+ * @param database Synchronous SQLite database client.
  * @returns A configured sqlite adapter.
  * @example
  * ```ts
- * import BetterSqlite3 from 'better-sqlite3'
+ * import { DatabaseSync } from 'node:sqlite'
  * import { createDatabase } from 'remix/data-table'
  * import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
  *
- * let sqlite = new BetterSqlite3('./data/app.db')
+ * let sqlite = new DatabaseSync('./data/app.db')
  * let adapter = createSqliteDatabaseAdapter(sqlite)
  * let db = createDatabase(adapter)
  * ```
  */
-export declare function createSqliteDatabaseAdapter(database: BetterSqliteDatabase): SqliteDatabaseAdapter;
+export declare function createSqliteDatabaseAdapter(database: SqliteDatabase): SqliteDatabaseAdapter;
 //# sourceMappingURL=adapter.d.ts.map

package/dist/lib/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EAEf,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAO9B,OAAO,KAAK,EAAE,QAAQ,IAAI,oBAAoB,EAAa,MAAM,gBAAgB,CAAA;AAIjF;;GAEG;AACH,qBAAa,qBAAsB,YAAW,eAAe;;IAC3D;;OAEG;IACH,OAAO,SAAW;IAElB;;OAEG;IACH,YAAY;;;;;;MAAA;IAMZ,YAAY,QAAQ,EAAE,oBAAoB,EASzC;IAED;;;;OAIG;IACH,UAAU,CAAC,SAAS,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,YAAY,EAAE,CAOxF;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAgC/E;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWzE;IAED;;;;;OAKG;IACG,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAahF;IAED;;;;;;OAMG;IACG,SAAS,CACb,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,gBAAgB,GAC7B,OAAO,CAAC,OAAO,CAAC,CAYlB;IAED;;;;OAIG;IACG,gBAAgB,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAY9E;IAED;;;;OAIG;IACG,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAI9D;IAED;;;;OAIG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhE;IAED;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1E;IAED;;;;;OAKG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E;CAOF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,oBAAoB,GAAG,qBAAqB,CAEjG"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EAEf,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAU9B;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;IACrC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAAA;IACpC,GAAG,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;IAClC,GAAG,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAA;IAC1C,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,OAAO,EAAE,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;CACzB;AAED;;GAEG;AACH,qBAAa,qBAAsB,YAAW,eAAe;;IAC3D;;OAEG;IACH,OAAO,SAAW;IAElB;;OAEG;IACH,YAAY;;;;;;MAAA;IAMZ,YAAY,QAAQ,EAAE,cAAc,EASnC;IAED;;;;OAIG;IACH,UAAU,CAAC,SAAS,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,YAAY,EAAE,CAOxF;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAiC/E;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWzE;IAED;;;;;OAKG;IACG,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAahF;IAED;;;;;;OAMG;IACG,SAAS,CACb,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,gBAAgB,GAC7B,OAAO,CAAC,OAAO,CAAC,CAYlB;IAED;;;;OAIG;IACG,gBAAgB,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAY9E;IAED;;;;OAIG;IACG,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAI9D;IAED;;;;OAIG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhE;IAED;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1E;IAED;;;;;OAKG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E;CAOF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,cAAc,GAAG,qBAAqB,CAE3F"}

package/dist/lib/adapter.js

@@ -2,7 +2,7 @@ import { getTablePrimaryKey } from '@remix-run/data-table';
 import { isDataManipulationOperation as isDataManipulationOperationHelper, quoteLiteral as quoteLiteralHelper, quoteTableRef as quoteTableRefHelper, } from '@remix-run/data-table/sql-helpers';
 import { compileSqliteOperation } from "./sql-compiler.js";
 /**
- * `DatabaseAdapter` implementation for Better SQLite3.
+ * `DatabaseAdapter` implementation for synchronous SQLite clients.
  */
 export class SqliteDatabaseAdapter {
     /**
@@ -53,8 +53,9 @@ export class SqliteDatabaseAdapter {
         }
         let statement = this.compileSql(request.operation)[0];
         let prepared = this.#database.prepare(statement.text);
-        if (prepared.reader) {
-            let rows = normalizeRows(prepared.all(...statement.values));
+        let values = normalizeStatementValues(statement.values);
+        if (shouldReadStatement(request.operation, prepared)) {
+            let rows = normalizeRows(prepared.all(...values));
             if (request.operation.kind === 'count' || request.operation.kind === 'exists') {
                 rows = normalizeCountRows(rows);
             }
@@ -64,7 +65,7 @@ export class SqliteDatabaseAdapter {
                 insertId: normalizeInsertIdForReader(request.operation.kind, request.operation, rows),
             };
         }
-        let result = prepared.run(...statement.values);
+        let result = prepared.run(...values);
         return {
             affectedRows: normalizeAffectedRowsForRun(request.operation.kind, result),
             insertId: normalizeInsertIdForRun(request.operation.kind, request.operation, result),
@@ -79,7 +80,7 @@ export class SqliteDatabaseAdapter {
         let statements = this.compileSql(request.operation);
         for (let statement of statements) {
             let prepared = this.#database.prepare(statement.text);
-            prepared.run(...statement.values);
+            prepared.run(...normalizeStatementValues(statement.values));
         }
         return {
             affectedOperations: statements.length,
@@ -125,7 +126,7 @@ export class SqliteDatabaseAdapter {
      */
     async beginTransaction(options) {
         if (options?.isolationLevel === 'read uncommitted') {
-            this.#database.pragma('read_uncommitted = true');
+            this.#database.exec('pragma read_uncommitted = true');
         }
         this.#database.exec('begin');
         this.#transactionCounter += 1;
@@ -191,16 +192,15 @@ export class SqliteDatabaseAdapter {
 }
 /**
  * Creates a sqlite `DatabaseAdapter`.
- * @param database Better SQLite3 database instance.
- * @param options Optional adapter capability overrides.
+ * @param database Synchronous SQLite database client.
  * @returns A configured sqlite adapter.
  * @example
  * ```ts
- * import BetterSqlite3 from 'better-sqlite3'
+ * import { DatabaseSync } from 'node:sqlite'
  * import { createDatabase } from 'remix/data-table'
  * import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
  *
- * let sqlite = new BetterSqlite3('./data/app.db')
+ * let sqlite = new DatabaseSync('./data/app.db')
  * let adapter = createSqliteDatabaseAdapter(sqlite)
  * let db = createDatabase(adapter)
  * ```
@@ -216,6 +216,9 @@ function normalizeRows(rows) {
         return { ...row };
     });
 }
+function normalizeStatementValues(values) {
+    return values.map((value) => (value === undefined ? null : value));
+}
 function normalizeCountRows(rows) {
     return rows.map((row) => {
         let count = row.count;
@@ -259,7 +262,7 @@ function normalizeAffectedRowsForRun(kind, result) {
     if (kind === 'select' || kind === 'count' || kind === 'exists') {
         return undefined;
     }
-    return result.changes;
+    return Number(result.changes);
 }
 function normalizeInsertIdForRun(kind, operation, result) {
     if (!isInsertOperationKind(kind) || !isInsertOperation(operation)) {
@@ -270,6 +273,26 @@ function normalizeInsertIdForRun(kind, operation, result) {
     }
     return result.lastInsertRowid;
 }
+function shouldReadStatement(operation, statement) {
+    if (operation.kind === 'select' || operation.kind === 'count' || operation.kind === 'exists') {
+        return true;
+    }
+    if (operation.kind !== 'raw') {
+        return operation.returning !== undefined;
+    }
+    if (typeof statement.reader === 'boolean') {
+        return statement.reader;
+    }
+    if (statement.columns) {
+        return statement.columns().length > 0;
+    }
+    try {
+        return statement.columnNames !== undefined && statement.columnNames.length > 0;
+    }
+    catch {
+        return false;
+    }
+}
 function quoteIdentifier(value) {
     return '"' + value.replace(/"/g, '""') + '"';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/data-table-sqlite",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "SQLite adapter for remix/data-table",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -27,22 +27,14 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^24.6.0",
     "@typescript/native-preview": "7.0.0-dev.20251125.1",
-    "better-sqlite3": "^12.4.1",
-    "@remix-run/data-table": "0.2.0"
+    "@remix-run/assert": "0.2.0",
+    "@remix-run/test": "0.3.0",
+    "@remix-run/data-table": "0.2.1"
   },
   "dependencies": {
-    "@remix-run/data-table": "^0.2.0"
-  },
-  "peerDependencies": {
-    "better-sqlite3": "^12.4.1"
-  },
-  "peerDependenciesMeta": {
-    "better-sqlite3": {
-      "optional": true
-    }
+    "@remix-run/data-table": "^0.2.1"
   },
   "keywords": [
     "remix",
@@ -54,8 +46,9 @@
   "scripts": {
     "build": "tsgo -p tsconfig.build.json",
     "clean": "git clean -fdX",
-    "test": "node --test",
-    "test:coverage": "node --experimental-test-coverage --test-coverage-include='src/**/*.ts' --test-coverage-lines=90 --test-coverage-branches=90 --test-coverage-functions=90 --test ./src/lib/adapter.test.ts ./src/lib/sql-compiler.test.ts",
+    "test": "remix-test",
+    "test:bun": "bun x --bun remix-test",
+    "test:coverage": "remix-test --coverage",
     "typecheck": "tsgo --noEmit"
   }
 }

package/src/index.ts

@@ -1 +1,2 @@
 export { createSqliteDatabaseAdapter, SqliteDatabaseAdapter } from './lib/adapter.ts'
+export type { SqliteDatabase, SqliteRunResult, SqliteStatement } from './lib/adapter.ts'

package/src/lib/adapter.ts

@@ -18,12 +18,42 @@ import {
   quoteLiteral as quoteLiteralHelper,
   quoteTableRef as quoteTableRefHelper,
 } from '@remix-run/data-table/sql-helpers'
-import type { Database as BetterSqliteDatabase, RunResult } from 'better-sqlite3'
 
 import { compileSqliteOperation } from './sql-compiler.ts'
 
 /**
- * `DatabaseAdapter` implementation for Better SQLite3.
+ * Synchronous SQLite database client accepted by the sqlite adapter.
+ *
+ * This matches the shared surface of Node's `node:sqlite` `DatabaseSync`, Bun's `bun:sqlite`
+ * `Database`, and compatible synchronous SQLite clients.
+ */
+export interface SqliteDatabase {
+  prepare(sql: string): SqliteStatement
+  exec(sql: string): unknown
+}
+
+/**
+ * Prepared statement shape used by {@link SqliteDatabase}.
+ */
+export interface SqliteStatement {
+  all(...values: unknown[]): unknown[]
+  get(...values: unknown[]): unknown
+  run(...values: unknown[]): SqliteRunResult
+  reader?: boolean
+  columns?: () => unknown[]
+  columnNames?: string[]
+}
+
+/**
+ * SQLite write execution metadata.
+ */
+export interface SqliteRunResult {
+  changes: number | bigint
+  lastInsertRowid: unknown
+}
+
+/**
+ * `DatabaseAdapter` implementation for synchronous SQLite clients.
  */
 export class SqliteDatabaseAdapter implements DatabaseAdapter {
   /**
@@ -36,11 +66,11 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
    */
   capabilities
 
-  #database: BetterSqliteDatabase
+  #database: SqliteDatabase
   #transactions = new Set<string>()
   #transactionCounter = 0
 
-  constructor(database: BetterSqliteDatabase) {
+  constructor(database: SqliteDatabase) {
     this.#database = database
     this.capabilities = {
       returning: true,
@@ -81,9 +111,10 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
 
     let statement = this.compileSql(request.operation)[0]
     let prepared = this.#database.prepare(statement.text)
+    let values = normalizeStatementValues(statement.values)
 
-    if (prepared.reader) {
-      let rows = normalizeRows(prepared.all(...statement.values))
+    if (shouldReadStatement(request.operation, prepared)) {
+      let rows = normalizeRows(prepared.all(...values))
 
       if (request.operation.kind === 'count' || request.operation.kind === 'exists') {
         rows = normalizeCountRows(rows)
@@ -96,7 +127,7 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
       }
     }
 
-    let result = prepared.run(...statement.values)
+    let result = prepared.run(...values)
 
     return {
       affectedRows: normalizeAffectedRowsForRun(request.operation.kind, result),
@@ -114,7 +145,7 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
 
     for (let statement of statements) {
       let prepared = this.#database.prepare(statement.text)
-      prepared.run(...statement.values)
+      prepared.run(...normalizeStatementValues(statement.values))
     }
 
     return {
@@ -175,7 +206,7 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
    */
   async beginTransaction(options?: TransactionOptions): Promise<TransactionToken> {
     if (options?.isolationLevel === 'read uncommitted') {
-      this.#database.pragma('read_uncommitted = true')
+      this.#database.exec('pragma read_uncommitted = true')
     }
 
     this.#database.exec('begin')
@@ -251,21 +282,20 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
 
 /**
  * Creates a sqlite `DatabaseAdapter`.
- * @param database Better SQLite3 database instance.
- * @param options Optional adapter capability overrides.
+ * @param database Synchronous SQLite database client.
  * @returns A configured sqlite adapter.
  * @example
  * ```ts
- * import BetterSqlite3 from 'better-sqlite3'
+ * import { DatabaseSync } from 'node:sqlite'
  * import { createDatabase } from 'remix/data-table'
  * import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
  *
- * let sqlite = new BetterSqlite3('./data/app.db')
+ * let sqlite = new DatabaseSync('./data/app.db')
  * let adapter = createSqliteDatabaseAdapter(sqlite)
  * let db = createDatabase(adapter)
  * ```
  */
-export function createSqliteDatabaseAdapter(database: BetterSqliteDatabase): SqliteDatabaseAdapter {
+export function createSqliteDatabaseAdapter(database: SqliteDatabase): SqliteDatabaseAdapter {
   return new SqliteDatabaseAdapter(database)
 }
 
@@ -279,6 +309,10 @@ function normalizeRows(rows: unknown[]): Record<string, unknown>[] {
   })
 }
 
+function normalizeStatementValues(values: unknown[]): unknown[] {
+  return values.map((value) => (value === undefined ? null : value))
+}
+
 function normalizeCountRows(rows: Record<string, unknown>[]): Record<string, unknown>[] {
   return rows.map((row) => {
     let count = row.count
@@ -339,19 +373,19 @@ function normalizeInsertIdForReader(
 
 function normalizeAffectedRowsForRun(
   kind: DataManipulationRequest['operation']['kind'],
-  result: RunResult,
+  result: SqliteRunResult,
 ): number | undefined {
   if (kind === 'select' || kind === 'count' || kind === 'exists') {
     return undefined
   }
 
-  return result.changes
+  return Number(result.changes)
 }
 
 function normalizeInsertIdForRun(
   kind: DataManipulationRequest['operation']['kind'],
   operation: DataManipulationRequest['operation'],
-  result: RunResult,
+  result: SqliteRunResult,
 ): unknown {
   if (!isInsertOperationKind(kind) || !isInsertOperation(operation)) {
     return undefined
@@ -364,6 +398,33 @@ function normalizeInsertIdForRun(
   return result.lastInsertRowid
 }
 
+function shouldReadStatement(
+  operation: DataManipulationRequest['operation'],
+  statement: SqliteStatement,
+): boolean {
+  if (operation.kind === 'select' || operation.kind === 'count' || operation.kind === 'exists') {
+    return true
+  }
+
+  if (operation.kind !== 'raw') {
+    return operation.returning !== undefined
+  }
+
+  if (typeof statement.reader === 'boolean') {
+    return statement.reader
+  }
+
+  if (statement.columns) {
+    return statement.columns().length > 0
+  }
+
+  try {
+    return statement.columnNames !== undefined && statement.columnNames.length > 0
+  } catch {
+    return false
+  }
+}
+
 function quoteIdentifier(value: string): string {
   return '"' + value.replace(/"/g, '""') + '"'
 }