@remix-run/data-table-sqlite 0.4.0 → 0.5.0

package/README.md

@@ -8,7 +8,7 @@ Use this package when you want `data-table` APIs backed by a synchronous SQLite
 - **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`
+- **Multi-Statement Migrations**: `executeScript()` runs `up.sql` / `down.sql` files via `Database.exec()`
 - **SQLite Capabilities Enabled By Default**:
   - `returning: true`
   - `savepoints: true`
@@ -29,7 +29,7 @@ npm i remix
 ```ts
 import { DatabaseSync } from 'node:sqlite'
 import { createDatabase } from 'remix/data-table'
-import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
+import { createSqliteDatabaseAdapter } from 'remix/data-table/sqlite'
 
 let sqlite = new DatabaseSync('app.db')
 let db = createDatabase(createSqliteDatabaseAdapter(sqlite))
@@ -40,7 +40,7 @@ let db = createDatabase(createSqliteDatabaseAdapter(sqlite))
 ```ts
 import { Database } from 'bun:sqlite'
 import { createDatabase } from 'remix/data-table'
-import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
+import { createSqliteDatabaseAdapter } from 'remix/data-table/sqlite'
 
 let sqlite = new Database('app.db')
 let db = createDatabase(createSqliteDatabaseAdapter(sqlite))
@@ -66,7 +66,7 @@ Import any driver-specific types you need directly from your runtime's SQLite mo
 ```ts
 import { DatabaseSync } from 'node:sqlite'
 import { createDatabase } from 'remix/data-table'
-import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
+import { createSqliteDatabaseAdapter } from 'remix/data-table/sqlite'
 
 let sqlite = new DatabaseSync(':memory:')
 let db = createDatabase(createSqliteDatabaseAdapter(sqlite))

package/dist/lib/adapter.d.ts

@@ -1,9 +1,9 @@
-import type { DataManipulationRequest, DataMigrationRequest, DataMigrationResult, DataMigrationOperation, DataManipulationResult, DataManipulationOperation, DatabaseAdapter, SqlStatement, TableRef, TransactionOptions, TransactionToken } from '@remix-run/data-table';
+import type { DataManipulationRequest, DataManipulationResult, DataManipulationOperation, DatabaseAdapter, SqlStatement, TableRef, TransactionOptions, TransactionToken } from '@remix-run/data-table';
 /**
  * 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 `better-sqlite3` database instances.
+ * `Database`, and compatible synchronous SQLite clients.
  */
 export interface SqliteDatabase {
     prepare(sql: string): SqliteStatement;
@@ -24,7 +24,7 @@ export interface SqliteStatement {
  * SQLite write execution metadata.
  */
 export interface SqliteRunResult {
-    changes: number;
+    changes: number | bigint;
     lastInsertRowid: unknown;
 }
 /**
@@ -48,11 +48,11 @@ export declare class SqliteDatabaseAdapter implements DatabaseAdapter {
     };
     constructor(database: SqliteDatabase);
     /**
-     * Compiles a data or migration operation to sqlite SQL statements.
+     * Compiles a data-manipulation operation to sqlite SQL statements.
      * @param operation Operation to compile.
      * @returns Compiled SQL statements.
      */
-    compileSql(operation: DataManipulationOperation | DataMigrationOperation): SqlStatement[];
+    compileSql(operation: DataManipulationOperation): SqlStatement[];
     /**
      * Executes a sqlite data-manipulation request.
      * @param request Request to execute.
@@ -60,11 +60,12 @@ export declare class SqliteDatabaseAdapter implements DatabaseAdapter {
      */
     execute(request: DataManipulationRequest): Promise<DataManipulationResult>;
     /**
-     * Executes sqlite migration operations.
-     * @param request Migration request to execute.
-     * @returns Migration result.
+     * Executes a multi-statement sqlite SQL script.
+     * @param sql SQL script to execute.
+     * @param transaction Optional transaction token (asserted when present).
+     * @returns A promise that resolves once execution completes.
      */
-    migrate(request: DataMigrationRequest): Promise<DataMigrationResult>;
+    executeScript(sql: string, transaction?: TransactionToken): Promise<void>;
     /**
      * Checks whether a table exists in sqlite.
      * @param table Table reference to inspect.
@@ -128,7 +129,7 @@ export declare class SqliteDatabaseAdapter implements DatabaseAdapter {
  * ```ts
  * import { DatabaseSync } from 'node:sqlite'
  * import { createDatabase } from 'remix/data-table'
- * import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
+ * import { createSqliteDatabaseAdapter } from 'remix/data-table/sqlite'
  *
  * let sqlite = new DatabaseSync('./data/app.db')
  * let adapter = createSqliteDatabaseAdapter(sqlite)

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;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,CAAA;IACf,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,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;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,cAAc,GAAG,qBAAqB,CAE3F"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAK9B;;;;;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,YAAY,EAAE,CAG/D;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAiC/E;IAED;;;;;OAKG;IACG,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAM9E;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

@@ -1,5 +1,4 @@
 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 synchronous SQLite clients.
@@ -27,16 +26,13 @@ export class SqliteDatabaseAdapter {
         };
     }
     /**
-     * Compiles a data or migration operation to sqlite SQL statements.
+     * Compiles a data-manipulation operation to sqlite SQL statements.
      * @param operation Operation to compile.
      * @returns Compiled SQL statements.
      */
     compileSql(operation) {
-        if (isDataManipulationOperation(operation)) {
-            let compiled = compileSqliteOperation(operation);
-            return [{ text: compiled.text, values: compiled.values }];
-        }
-        return compileSqliteMigrationOperations(operation);
+        let compiled = compileSqliteOperation(operation);
+        return [{ text: compiled.text, values: compiled.values }];
     }
     /**
      * Executes a sqlite data-manipulation request.
@@ -53,8 +49,9 @@ export class SqliteDatabaseAdapter {
         }
         let statement = this.compileSql(request.operation)[0];
         let prepared = this.#database.prepare(statement.text);
+        let values = normalizeStatementValues(statement.values);
         if (shouldReadStatement(request.operation, prepared)) {
-            let rows = normalizeRows(prepared.all(...statement.values));
+            let rows = normalizeRows(prepared.all(...values));
             if (request.operation.kind === 'count' || request.operation.kind === 'exists') {
                 rows = normalizeCountRows(rows);
             }
@@ -64,26 +61,23 @@ 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),
         };
     }
     /**
-     * Executes sqlite migration operations.
-     * @param request Migration request to execute.
-     * @returns Migration result.
+     * Executes a multi-statement sqlite SQL script.
+     * @param sql SQL script to execute.
+     * @param transaction Optional transaction token (asserted when present).
+     * @returns A promise that resolves once execution completes.
      */
-    async migrate(request) {
-        let statements = this.compileSql(request.operation);
-        for (let statement of statements) {
-            let prepared = this.#database.prepare(statement.text);
-            prepared.run(...statement.values);
+    async executeScript(sql, transaction) {
+        if (transaction) {
+            this.#assertTransaction(transaction);
         }
-        return {
-            affectedOperations: statements.length,
-        };
+        this.#database.exec(sql);
     }
     /**
      * Checks whether a table exists in sqlite.
@@ -197,7 +191,7 @@ export class SqliteDatabaseAdapter {
  * ```ts
  * import { DatabaseSync } from 'node:sqlite'
  * import { createDatabase } from 'remix/data-table'
- * import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
+ * import { createSqliteDatabaseAdapter } from 'remix/data-table/sqlite'
  *
  * let sqlite = new DatabaseSync('./data/app.db')
  * let adapter = createSqliteDatabaseAdapter(sqlite)
@@ -215,6 +209,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;
@@ -258,7 +255,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)) {
@@ -292,12 +289,6 @@ function shouldReadStatement(operation, statement) {
 function quoteIdentifier(value) {
     return '"' + value.replace(/"/g, '""') + '"';
 }
-function quoteTableRef(table) {
-    return quoteTableRefHelper(table, quoteIdentifier);
-}
-function quoteLiteral(value) {
-    return quoteLiteralHelper(value, { booleansAsIntegers: true });
-}
 function isWriteOperationKind(kind) {
     return (kind === 'insert' ||
         kind === 'insertMany' ||
@@ -311,361 +302,3 @@ function isInsertOperationKind(kind) {
 function isInsertOperation(operation) {
     return (operation.kind === 'insert' || operation.kind === 'insertMany' || operation.kind === 'upsert');
 }
-function isDataManipulationOperation(operation) {
-    return isDataManipulationOperationHelper(operation);
-}
-function compileSqliteMigrationOperations(operation) {
-    if (operation.kind === 'raw') {
-        return [{ text: operation.sql.text, values: [...operation.sql.values] }];
-    }
-    if (operation.kind === 'createTable') {
-        let columns = Object.keys(operation.columns).map((columnName) => quoteIdentifier(columnName) + ' ' + compileSqliteColumn(operation.columns[columnName]));
-        let constraints = [];
-        if (operation.primaryKey) {
-            constraints.push('constraint ' +
-                quoteIdentifier(operation.primaryKey.name) +
-                ' primary key (' +
-                operation.primaryKey.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                ')');
-        }
-        for (let unique of operation.uniques ?? []) {
-            constraints.push('constraint ' +
-                quoteIdentifier(unique.name) +
-                ' ' +
-                'unique (' +
-                unique.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                ')');
-        }
-        for (let check of operation.checks ?? []) {
-            constraints.push('constraint ' + quoteIdentifier(check.name) + ' ' + 'check (' + check.expression + ')');
-        }
-        for (let foreignKey of operation.foreignKeys ?? []) {
-            let clause = 'constraint ' +
-                quoteIdentifier(foreignKey.name) +
-                ' ' +
-                'foreign key (' +
-                foreignKey.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                ') references ' +
-                quoteTableRef(foreignKey.references.table) +
-                ' (' +
-                foreignKey.references.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                ')';
-            if (foreignKey.onDelete) {
-                clause += ' on delete ' + foreignKey.onDelete;
-            }
-            if (foreignKey.onUpdate) {
-                clause += ' on update ' + foreignKey.onUpdate;
-            }
-            constraints.push(clause);
-        }
-        return [
-            {
-                text: 'create table ' +
-                    (operation.ifNotExists ? 'if not exists ' : '') +
-                    quoteTableRef(operation.table) +
-                    ' (' +
-                    [...columns, ...constraints].join(', ') +
-                    ')',
-                values: [],
-            },
-        ];
-    }
-    if (operation.kind === 'alterTable') {
-        let statements = [];
-        for (let change of operation.changes) {
-            let sql = 'alter table ' + quoteTableRef(operation.table) + ' ';
-            if (change.kind === 'addColumn') {
-                sql +=
-                    'add column ' +
-                        quoteIdentifier(change.column) +
-                        ' ' +
-                        compileSqliteColumn(change.definition);
-            }
-            else if (change.kind === 'changeColumn') {
-                sql +=
-                    'alter column ' +
-                        quoteIdentifier(change.column) +
-                        ' type ' +
-                        compileSqliteColumnType(change.definition);
-            }
-            else if (change.kind === 'renameColumn') {
-                sql += 'rename column ' + quoteIdentifier(change.from) + ' to ' + quoteIdentifier(change.to);
-            }
-            else if (change.kind === 'dropColumn') {
-                sql += 'drop column ' + quoteIdentifier(change.column);
-            }
-            else if (change.kind === 'addPrimaryKey') {
-                sql +=
-                    'add primary key (' +
-                        change.constraint.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                        ')';
-            }
-            else if (change.kind === 'dropPrimaryKey') {
-                sql += 'drop primary key';
-            }
-            else if (change.kind === 'addUnique') {
-                sql +=
-                    'add ' +
-                        'constraint ' +
-                        quoteIdentifier(change.constraint.name) +
-                        ' ' +
-                        'unique (' +
-                        change.constraint.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                        ')';
-            }
-            else if (change.kind === 'dropUnique') {
-                sql += 'drop constraint ' + quoteIdentifier(change.name);
-            }
-            else if (change.kind === 'addForeignKey') {
-                sql +=
-                    'add ' +
-                        'constraint ' +
-                        quoteIdentifier(change.constraint.name) +
-                        ' ' +
-                        'foreign key (' +
-                        change.constraint.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                        ') references ' +
-                        quoteTableRef(change.constraint.references.table) +
-                        ' (' +
-                        change.constraint.references.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                        ')';
-            }
-            else if (change.kind === 'dropForeignKey') {
-                sql += 'drop constraint ' + quoteIdentifier(change.name);
-            }
-            else if (change.kind === 'addCheck') {
-                sql +=
-                    'add ' +
-                        'constraint ' +
-                        quoteIdentifier(change.constraint.name) +
-                        ' ' +
-                        'check (' +
-                        change.constraint.expression +
-                        ')';
-            }
-            else if (change.kind === 'dropCheck') {
-                sql += 'drop constraint ' + quoteIdentifier(change.name);
-            }
-            else if (change.kind === 'setTableComment') {
-                continue;
-            }
-            else {
-                continue;
-            }
-            statements.push({ text: sql, values: [] });
-        }
-        return statements;
-    }
-    if (operation.kind === 'renameTable') {
-        return [
-            {
-                text: 'alter table ' +
-                    quoteTableRef(operation.from) +
-                    ' rename to ' +
-                    quoteIdentifier(operation.to.name),
-                values: [],
-            },
-        ];
-    }
-    if (operation.kind === 'dropTable') {
-        return [
-            {
-                text: 'drop table ' + (operation.ifExists ? 'if exists ' : '') + quoteTableRef(operation.table),
-                values: [],
-            },
-        ];
-    }
-    if (operation.kind === 'createIndex') {
-        return [
-            {
-                text: 'create ' +
-                    (operation.index.unique ? 'unique ' : '') +
-                    'index ' +
-                    (operation.ifNotExists ? 'if not exists ' : '') +
-                    quoteIdentifier(operation.index.name) +
-                    ' on ' +
-                    quoteTableRef(operation.index.table) +
-                    ' (' +
-                    operation.index.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                    ')' +
-                    (operation.index.where ? ' where ' + operation.index.where : ''),
-                values: [],
-            },
-        ];
-    }
-    if (operation.kind === 'dropIndex') {
-        return [
-            {
-                text: 'drop index ' +
-                    (operation.ifExists ? 'if exists ' : '') +
-                    quoteIdentifier(operation.name),
-                values: [],
-            },
-        ];
-    }
-    if (operation.kind === 'renameIndex') {
-        return [
-            {
-                text: 'alter table ' +
-                    quoteTableRef(operation.table) +
-                    ' rename index ' +
-                    quoteIdentifier(operation.from) +
-                    ' to ' +
-                    quoteIdentifier(operation.to),
-                values: [],
-            },
-        ];
-    }
-    if (operation.kind === 'addForeignKey') {
-        return [
-            {
-                text: 'alter table ' +
-                    quoteTableRef(operation.table) +
-                    ' add ' +
-                    'constraint ' +
-                    quoteIdentifier(operation.constraint.name) +
-                    ' ' +
-                    'foreign key (' +
-                    operation.constraint.columns.map((column) => quoteIdentifier(column)).join(', ') +
-                    ') references ' +
-                    quoteTableRef(operation.constraint.references.table) +
-                    ' (' +
-                    operation.constraint.references.columns
-                        .map((column) => quoteIdentifier(column))
-                        .join(', ') +
-                    ')' +
-                    (operation.constraint.onDelete ? ' on delete ' + operation.constraint.onDelete : '') +
-                    (operation.constraint.onUpdate ? ' on update ' + operation.constraint.onUpdate : ''),
-                values: [],
-            },
-        ];
-    }
-    if (operation.kind === 'dropForeignKey') {
-        return [
-            {
-                text: 'alter table ' +
-                    quoteTableRef(operation.table) +
-                    ' drop constraint ' +
-                    quoteIdentifier(operation.name),
-                values: [],
-            },
-        ];
-    }
-    if (operation.kind === 'addCheck') {
-        return [
-            {
-                text: 'alter table ' +
-                    quoteTableRef(operation.table) +
-                    ' add ' +
-                    'constraint ' +
-                    quoteIdentifier(operation.constraint.name) +
-                    ' ' +
-                    'check (' +
-                    operation.constraint.expression +
-                    ')',
-                values: [],
-            },
-        ];
-    }
-    if (operation.kind === 'dropCheck') {
-        return [
-            {
-                text: 'alter table ' +
-                    quoteTableRef(operation.table) +
-                    ' drop constraint ' +
-                    quoteIdentifier(operation.name),
-                values: [],
-            },
-        ];
-    }
-    throw new Error('Unsupported data migration operation kind');
-}
-function compileSqliteColumn(definition) {
-    let parts = [compileSqliteColumnType(definition)];
-    if (definition.nullable === false) {
-        parts.push('not null');
-    }
-    if (definition.default) {
-        if (definition.default.kind === 'now') {
-            parts.push('default current_timestamp');
-        }
-        else if (definition.default.kind === 'sql') {
-            parts.push('default ' + definition.default.expression);
-        }
-        else {
-            parts.push('default ' + quoteLiteral(definition.default.value));
-        }
-    }
-    if (definition.primaryKey) {
-        parts.push('primary key');
-    }
-    if (definition.unique) {
-        parts.push('unique');
-    }
-    if (definition.computed) {
-        parts.push('generated always as (' + definition.computed.expression + ')');
-        parts.push(definition.computed.stored ? 'stored' : 'virtual');
-    }
-    if (definition.references) {
-        let clause = 'references ' +
-            quoteTableRef(definition.references.table) +
-            ' (' +
-            definition.references.columns.map((column) => quoteIdentifier(column)).join(', ') +
-            ')';
-        if (definition.references.onDelete) {
-            clause += ' on delete ' + definition.references.onDelete;
-        }
-        if (definition.references.onUpdate) {
-            clause += ' on update ' + definition.references.onUpdate;
-        }
-        parts.push(clause);
-    }
-    if (definition.checks && definition.checks.length > 0) {
-        for (let check of definition.checks) {
-            parts.push('check (' + check.expression + ')');
-        }
-    }
-    return parts.join(' ');
-}
-function compileSqliteColumnType(definition) {
-    if (definition.type === 'varchar') {
-        return 'text';
-    }
-    if (definition.type === 'text') {
-        return 'text';
-    }
-    if (definition.type === 'integer') {
-        return 'integer';
-    }
-    if (definition.type === 'bigint') {
-        return 'integer';
-    }
-    if (definition.type === 'decimal') {
-        return 'numeric';
-    }
-    if (definition.type === 'boolean') {
-        return 'integer';
-    }
-    if (definition.type === 'uuid') {
-        return 'text';
-    }
-    if (definition.type === 'date') {
-        return 'text';
-    }
-    if (definition.type === 'time') {
-        return 'text';
-    }
-    if (definition.type === 'timestamp') {
-        return 'text';
-    }
-    if (definition.type === 'json') {
-        return 'text';
-    }
-    if (definition.type === 'binary') {
-        return 'blob';
-    }
-    if (definition.type === 'enum') {
-        return 'text';
-    }
-    return 'text';
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/data-table-sqlite",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "SQLite adapter for remix/data-table",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -29,12 +29,12 @@
   "devDependencies": {
     "@types/node": "^24.6.0",
     "@typescript/native-preview": "7.0.0-dev.20251125.1",
-    "@remix-run/assert": "0.1.0",
-    "@remix-run/data-table": "0.2.0",
-    "@remix-run/test": "0.2.0"
+    "@remix-run/assert": "0.2.0",
+    "@remix-run/test": "0.4.0",
+    "@remix-run/data-table": "0.3.0"
   },
   "dependencies": {
-    "@remix-run/data-table": "^0.2.0"
+    "@remix-run/data-table": "^0.3.0"
   },
   "keywords": [
     "remix",

package/src/lib/adapter.ts

@@ -1,23 +1,14 @@
 import type {
   DataManipulationRequest,
-  DataMigrationRequest,
-  DataMigrationResult,
-  DataMigrationOperation,
   DataManipulationResult,
   DataManipulationOperation,
   DatabaseAdapter,
-  ColumnDefinition,
   SqlStatement,
   TableRef,
   TransactionOptions,
   TransactionToken,
 } from '@remix-run/data-table'
 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.ts'
 
@@ -25,7 +16,7 @@ import { compileSqliteOperation } from './sql-compiler.ts'
  * 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 `better-sqlite3` database instances.
+ * `Database`, and compatible synchronous SQLite clients.
  */
 export interface SqliteDatabase {
   prepare(sql: string): SqliteStatement
@@ -48,7 +39,7 @@ export interface SqliteStatement {
  * SQLite write execution metadata.
  */
 export interface SqliteRunResult {
-  changes: number
+  changes: number | bigint
   lastInsertRowid: unknown
 }
 
@@ -82,17 +73,13 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
   }
 
   /**
-   * Compiles a data or migration operation to sqlite SQL statements.
+   * Compiles a data-manipulation operation to sqlite SQL statements.
    * @param operation Operation to compile.
    * @returns Compiled SQL statements.
    */
-  compileSql(operation: DataManipulationOperation | DataMigrationOperation): SqlStatement[] {
-    if (isDataManipulationOperation(operation)) {
-      let compiled = compileSqliteOperation(operation)
-      return [{ text: compiled.text, values: compiled.values }]
-    }
-
-    return compileSqliteMigrationOperations(operation)
+  compileSql(operation: DataManipulationOperation): SqlStatement[] {
+    let compiled = compileSqliteOperation(operation)
+    return [{ text: compiled.text, values: compiled.values }]
   }
 
   /**
@@ -111,9 +98,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 (shouldReadStatement(request.operation, prepared)) {
-      let rows = normalizeRows(prepared.all(...statement.values))
+      let rows = normalizeRows(prepared.all(...values))
 
       if (request.operation.kind === 'count' || request.operation.kind === 'exists') {
         rows = normalizeCountRows(rows)
@@ -126,7 +114,7 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
       }
     }
 
-    let result = prepared.run(...statement.values)
+    let result = prepared.run(...values)
 
     return {
       affectedRows: normalizeAffectedRowsForRun(request.operation.kind, result),
@@ -135,21 +123,17 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
   }
 
   /**
-   * Executes sqlite migration operations.
-   * @param request Migration request to execute.
-   * @returns Migration result.
+   * Executes a multi-statement sqlite SQL script.
+   * @param sql SQL script to execute.
+   * @param transaction Optional transaction token (asserted when present).
+   * @returns A promise that resolves once execution completes.
    */
-  async migrate(request: DataMigrationRequest): Promise<DataMigrationResult> {
-    let statements = this.compileSql(request.operation)
-
-    for (let statement of statements) {
-      let prepared = this.#database.prepare(statement.text)
-      prepared.run(...statement.values)
+  async executeScript(sql: string, transaction?: TransactionToken): Promise<void> {
+    if (transaction) {
+      this.#assertTransaction(transaction)
     }
 
-    return {
-      affectedOperations: statements.length,
-    }
+    this.#database.exec(sql)
   }
 
   /**
@@ -287,7 +271,7 @@ export class SqliteDatabaseAdapter implements DatabaseAdapter {
  * ```ts
  * import { DatabaseSync } from 'node:sqlite'
  * import { createDatabase } from 'remix/data-table'
- * import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
+ * import { createSqliteDatabaseAdapter } from 'remix/data-table/sqlite'
  *
  * let sqlite = new DatabaseSync('./data/app.db')
  * let adapter = createSqliteDatabaseAdapter(sqlite)
@@ -308,6 +292,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
@@ -374,7 +362,7 @@ function normalizeAffectedRowsForRun(
     return undefined
   }
 
-  return result.changes
+  return Number(result.changes)
 }
 
 function normalizeInsertIdForRun(
@@ -424,14 +412,6 @@ function quoteIdentifier(value: string): string {
   return '"' + value.replace(/"/g, '""') + '"'
 }
 
-function quoteTableRef(table: TableRef): string {
-  return quoteTableRefHelper(table, quoteIdentifier)
-}
-
-function quoteLiteral(value: unknown): string {
-  return quoteLiteralHelper(value, { booleansAsIntegers: true })
-}
-
 function isWriteOperationKind(kind: DataManipulationRequest['operation']['kind']): boolean {
   return (
     kind === 'insert' ||
@@ -456,421 +436,3 @@ function isInsertOperation(
     operation.kind === 'insert' || operation.kind === 'insertMany' || operation.kind === 'upsert'
   )
 }
-
-function isDataManipulationOperation(
-  operation: DataManipulationOperation | DataMigrationOperation,
-): operation is DataManipulationOperation {
-  return isDataManipulationOperationHelper(operation)
-}
-
-function compileSqliteMigrationOperations(operation: DataMigrationOperation): SqlStatement[] {
-  if (operation.kind === 'raw') {
-    return [{ text: operation.sql.text, values: [...operation.sql.values] }]
-  }
-
-  if (operation.kind === 'createTable') {
-    let columns = Object.keys(operation.columns).map(
-      (columnName) =>
-        quoteIdentifier(columnName) + ' ' + compileSqliteColumn(operation.columns[columnName]),
-    )
-    let constraints: string[] = []
-
-    if (operation.primaryKey) {
-      constraints.push(
-        'constraint ' +
-          quoteIdentifier(operation.primaryKey.name) +
-          ' primary key (' +
-          operation.primaryKey.columns.map((column) => quoteIdentifier(column)).join(', ') +
-          ')',
-      )
-    }
-
-    for (let unique of operation.uniques ?? []) {
-      constraints.push(
-        'constraint ' +
-          quoteIdentifier(unique.name) +
-          ' ' +
-          'unique (' +
-          unique.columns.map((column) => quoteIdentifier(column)).join(', ') +
-          ')',
-      )
-    }
-
-    for (let check of operation.checks ?? []) {
-      constraints.push(
-        'constraint ' + quoteIdentifier(check.name) + ' ' + 'check (' + check.expression + ')',
-      )
-    }
-
-    for (let foreignKey of operation.foreignKeys ?? []) {
-      let clause =
-        'constraint ' +
-        quoteIdentifier(foreignKey.name) +
-        ' ' +
-        'foreign key (' +
-        foreignKey.columns.map((column) => quoteIdentifier(column)).join(', ') +
-        ') references ' +
-        quoteTableRef(foreignKey.references.table) +
-        ' (' +
-        foreignKey.references.columns.map((column) => quoteIdentifier(column)).join(', ') +
-        ')'
-
-      if (foreignKey.onDelete) {
-        clause += ' on delete ' + foreignKey.onDelete
-      }
-
-      if (foreignKey.onUpdate) {
-        clause += ' on update ' + foreignKey.onUpdate
-      }
-
-      constraints.push(clause)
-    }
-
-    return [
-      {
-        text:
-          'create table ' +
-          (operation.ifNotExists ? 'if not exists ' : '') +
-          quoteTableRef(operation.table) +
-          ' (' +
-          [...columns, ...constraints].join(', ') +
-          ')',
-        values: [],
-      },
-    ]
-  }
-
-  if (operation.kind === 'alterTable') {
-    let statements: SqlStatement[] = []
-
-    for (let change of operation.changes) {
-      let sql = 'alter table ' + quoteTableRef(operation.table) + ' '
-
-      if (change.kind === 'addColumn') {
-        sql +=
-          'add column ' +
-          quoteIdentifier(change.column) +
-          ' ' +
-          compileSqliteColumn(change.definition)
-      } else if (change.kind === 'changeColumn') {
-        sql +=
-          'alter column ' +
-          quoteIdentifier(change.column) +
-          ' type ' +
-          compileSqliteColumnType(change.definition)
-      } else if (change.kind === 'renameColumn') {
-        sql += 'rename column ' + quoteIdentifier(change.from) + ' to ' + quoteIdentifier(change.to)
-      } else if (change.kind === 'dropColumn') {
-        sql += 'drop column ' + quoteIdentifier(change.column)
-      } else if (change.kind === 'addPrimaryKey') {
-        sql +=
-          'add primary key (' +
-          change.constraint.columns.map((column) => quoteIdentifier(column)).join(', ') +
-          ')'
-      } else if (change.kind === 'dropPrimaryKey') {
-        sql += 'drop primary key'
-      } else if (change.kind === 'addUnique') {
-        sql +=
-          'add ' +
-          'constraint ' +
-          quoteIdentifier(change.constraint.name) +
-          ' ' +
-          'unique (' +
-          change.constraint.columns.map((column) => quoteIdentifier(column)).join(', ') +
-          ')'
-      } else if (change.kind === 'dropUnique') {
-        sql += 'drop constraint ' + quoteIdentifier(change.name)
-      } else if (change.kind === 'addForeignKey') {
-        sql +=
-          'add ' +
-          'constraint ' +
-          quoteIdentifier(change.constraint.name) +
-          ' ' +
-          'foreign key (' +
-          change.constraint.columns.map((column) => quoteIdentifier(column)).join(', ') +
-          ') references ' +
-          quoteTableRef(change.constraint.references.table) +
-          ' (' +
-          change.constraint.references.columns.map((column) => quoteIdentifier(column)).join(', ') +
-          ')'
-      } else if (change.kind === 'dropForeignKey') {
-        sql += 'drop constraint ' + quoteIdentifier(change.name)
-      } else if (change.kind === 'addCheck') {
-        sql +=
-          'add ' +
-          'constraint ' +
-          quoteIdentifier(change.constraint.name) +
-          ' ' +
-          'check (' +
-          change.constraint.expression +
-          ')'
-      } else if (change.kind === 'dropCheck') {
-        sql += 'drop constraint ' + quoteIdentifier(change.name)
-      } else if (change.kind === 'setTableComment') {
-        continue
-      } else {
-        continue
-      }
-
-      statements.push({ text: sql, values: [] })
-    }
-
-    return statements
-  }
-
-  if (operation.kind === 'renameTable') {
-    return [
-      {
-        text:
-          'alter table ' +
-          quoteTableRef(operation.from) +
-          ' rename to ' +
-          quoteIdentifier(operation.to.name),
-        values: [],
-      },
-    ]
-  }
-
-  if (operation.kind === 'dropTable') {
-    return [
-      {
-        text:
-          'drop table ' + (operation.ifExists ? 'if exists ' : '') + quoteTableRef(operation.table),
-        values: [],
-      },
-    ]
-  }
-
-  if (operation.kind === 'createIndex') {
-    return [
-      {
-        text:
-          'create ' +
-          (operation.index.unique ? 'unique ' : '') +
-          'index ' +
-          (operation.ifNotExists ? 'if not exists ' : '') +
-          quoteIdentifier(operation.index.name) +
-          ' on ' +
-          quoteTableRef(operation.index.table) +
-          ' (' +
-          operation.index.columns.map((column) => quoteIdentifier(column)).join(', ') +
-          ')' +
-          (operation.index.where ? ' where ' + operation.index.where : ''),
-        values: [],
-      },
-    ]
-  }
-
-  if (operation.kind === 'dropIndex') {
-    return [
-      {
-        text:
-          'drop index ' +
-          (operation.ifExists ? 'if exists ' : '') +
-          quoteIdentifier(operation.name),
-        values: [],
-      },
-    ]
-  }
-
-  if (operation.kind === 'renameIndex') {
-    return [
-      {
-        text:
-          'alter table ' +
-          quoteTableRef(operation.table) +
-          ' rename index ' +
-          quoteIdentifier(operation.from) +
-          ' to ' +
-          quoteIdentifier(operation.to),
-        values: [],
-      },
-    ]
-  }
-
-  if (operation.kind === 'addForeignKey') {
-    return [
-      {
-        text:
-          'alter table ' +
-          quoteTableRef(operation.table) +
-          ' add ' +
-          'constraint ' +
-          quoteIdentifier(operation.constraint.name) +
-          ' ' +
-          'foreign key (' +
-          operation.constraint.columns.map((column) => quoteIdentifier(column)).join(', ') +
-          ') references ' +
-          quoteTableRef(operation.constraint.references.table) +
-          ' (' +
-          operation.constraint.references.columns
-            .map((column) => quoteIdentifier(column))
-            .join(', ') +
-          ')' +
-          (operation.constraint.onDelete ? ' on delete ' + operation.constraint.onDelete : '') +
-          (operation.constraint.onUpdate ? ' on update ' + operation.constraint.onUpdate : ''),
-        values: [],
-      },
-    ]
-  }
-
-  if (operation.kind === 'dropForeignKey') {
-    return [
-      {
-        text:
-          'alter table ' +
-          quoteTableRef(operation.table) +
-          ' drop constraint ' +
-          quoteIdentifier(operation.name),
-        values: [],
-      },
-    ]
-  }
-
-  if (operation.kind === 'addCheck') {
-    return [
-      {
-        text:
-          'alter table ' +
-          quoteTableRef(operation.table) +
-          ' add ' +
-          'constraint ' +
-          quoteIdentifier(operation.constraint.name) +
-          ' ' +
-          'check (' +
-          operation.constraint.expression +
-          ')',
-        values: [],
-      },
-    ]
-  }
-
-  if (operation.kind === 'dropCheck') {
-    return [
-      {
-        text:
-          'alter table ' +
-          quoteTableRef(operation.table) +
-          ' drop constraint ' +
-          quoteIdentifier(operation.name),
-        values: [],
-      },
-    ]
-  }
-
-  throw new Error('Unsupported data migration operation kind')
-}
-
-function compileSqliteColumn(definition: ColumnDefinition): string {
-  let parts = [compileSqliteColumnType(definition)]
-
-  if (definition.nullable === false) {
-    parts.push('not null')
-  }
-
-  if (definition.default) {
-    if (definition.default.kind === 'now') {
-      parts.push('default current_timestamp')
-    } else if (definition.default.kind === 'sql') {
-      parts.push('default ' + definition.default.expression)
-    } else {
-      parts.push('default ' + quoteLiteral(definition.default.value))
-    }
-  }
-
-  if (definition.primaryKey) {
-    parts.push('primary key')
-  }
-
-  if (definition.unique) {
-    parts.push('unique')
-  }
-
-  if (definition.computed) {
-    parts.push('generated always as (' + definition.computed.expression + ')')
-    parts.push(definition.computed.stored ? 'stored' : 'virtual')
-  }
-
-  if (definition.references) {
-    let clause =
-      'references ' +
-      quoteTableRef(definition.references.table) +
-      ' (' +
-      definition.references.columns.map((column) => quoteIdentifier(column)).join(', ') +
-      ')'
-
-    if (definition.references.onDelete) {
-      clause += ' on delete ' + definition.references.onDelete
-    }
-
-    if (definition.references.onUpdate) {
-      clause += ' on update ' + definition.references.onUpdate
-    }
-
-    parts.push(clause)
-  }
-
-  if (definition.checks && definition.checks.length > 0) {
-    for (let check of definition.checks) {
-      parts.push('check (' + check.expression + ')')
-    }
-  }
-
-  return parts.join(' ')
-}
-
-function compileSqliteColumnType(definition: ColumnDefinition): string {
-  if (definition.type === 'varchar') {
-    return 'text'
-  }
-
-  if (definition.type === 'text') {
-    return 'text'
-  }
-
-  if (definition.type === 'integer') {
-    return 'integer'
-  }
-
-  if (definition.type === 'bigint') {
-    return 'integer'
-  }
-
-  if (definition.type === 'decimal') {
-    return 'numeric'
-  }
-
-  if (definition.type === 'boolean') {
-    return 'integer'
-  }
-
-  if (definition.type === 'uuid') {
-    return 'text'
-  }
-
-  if (definition.type === 'date') {
-    return 'text'
-  }
-
-  if (definition.type === 'time') {
-    return 'text'
-  }
-
-  if (definition.type === 'timestamp') {
-    return 'text'
-  }
-
-  if (definition.type === 'json') {
-    return 'text'
-  }
-
-  if (definition.type === 'binary') {
-    return 'blob'
-  }
-
-  if (definition.type === 'enum') {
-    return 'text'
-  }
-
-  return 'text'
-}