@livestore/common 0.3.0-dev.3 → 0.3.0-dev.30

package/dist/query-builder/astToSql.js

@@ -0,0 +1,190 @@
+import { shouldNeverHappen } from '@livestore/utils';
+import { Schema } from '@livestore/utils/effect';
+import { SessionIdSymbol } from '../adapter-types.js';
+// Helper functions for SQL generation
+const formatWhereClause = (whereConditions, tableDef, bindValues) => {
+    if (whereConditions.length === 0)
+        return '';
+    const whereClause = whereConditions
+        .map(({ col, op, value }) => {
+        // Handle NULL values
+        if (value === null) {
+            if (op !== '=' && op !== '!=') {
+                throw new Error(`Unsupported operator for NULL value: ${op}`);
+            }
+            const opStmt = op === '=' ? 'IS' : 'IS NOT';
+            return `${col} ${opStmt} NULL`;
+        }
+        // Get column definition and encode value
+        const colDef = tableDef.sqliteDef.columns[col];
+        if (colDef === undefined) {
+            throw new Error(`Column ${col} not found`);
+        }
+        // Handle array values for IN/NOT IN operators
+        const isArray = op === 'IN' || op === 'NOT IN';
+        if (isArray) {
+            // Verify value is an array
+            if (!Array.isArray(value)) {
+                return shouldNeverHappen(`Expected array value for ${op} operator but got`, value);
+            }
+            // Handle empty arrays
+            if (value.length === 0) {
+                return op === 'IN' ? '0=1' : '1=1';
+            }
+            const encodedValues = value.map((v) => Schema.encodeSync(colDef.schema)(v));
+            bindValues.push(...encodedValues);
+            const placeholders = encodedValues.map(() => '?').join(', ');
+            return `${col} ${op} (${placeholders})`;
+        }
+        else {
+            const encodedValue = Schema.encodeSync(colDef.schema)(value);
+            bindValues.push(encodedValue);
+            return `${col} ${op} ?`;
+        }
+    })
+        .join(' AND ');
+    return `WHERE ${whereClause}`;
+};
+const formatReturningClause = (returning) => {
+    if (!returning || returning.length === 0)
+        return '';
+    return ` RETURNING ${returning.join(', ')}`;
+};
+export const astToSql = (ast) => {
+    const bindValues = [];
+    // INSERT query
+    if (ast._tag === 'InsertQuery') {
+        const columns = Object.keys(ast.values);
+        const placeholders = columns.map(() => '?').join(', ');
+        const encodedValues = Schema.encodeSync(ast.tableDef.insertSchema)(ast.values);
+        // Ensure bind values are added in the same order as columns
+        columns.forEach((col) => {
+            bindValues.push(encodedValues[col]);
+        });
+        let insertVerb = 'INSERT';
+        let conflictClause = ''; // Store the ON CONFLICT clause separately
+        // Handle ON CONFLICT clause
+        if (ast.onConflict) {
+            // Handle REPLACE specifically as it changes the INSERT verb
+            if (ast.onConflict.action._tag === 'replace') {
+                insertVerb = 'INSERT OR REPLACE';
+                // For REPLACE, the conflict target is implied and no further clause is needed
+            }
+            else {
+                // Build the ON CONFLICT clause for IGNORE or UPDATE
+                conflictClause = ` ON CONFLICT (${ast.onConflict.targets.join(', ')}) `;
+                if (ast.onConflict.action._tag === 'ignore') {
+                    conflictClause += 'DO NOTHING';
+                }
+                else {
+                    // Handle the update record case
+                    const updateValues = ast.onConflict.action.update;
+                    const updateCols = Object.keys(updateValues);
+                    if (updateCols.length === 0) {
+                        throw new Error('No update columns provided for ON CONFLICT DO UPDATE');
+                    }
+                    const updates = updateCols
+                        .map((col) => {
+                        const value = updateValues[col];
+                        // If the value is undefined, use excluded.col
+                        return value === undefined ? `${col} = excluded.${col}` : `${col} = ?`;
+                    })
+                        .join(', ');
+                    // Add values for the parameters
+                    updateCols.forEach((col) => {
+                        const value = updateValues[col];
+                        if (value !== undefined) {
+                            const colDef = ast.tableDef.sqliteDef.columns[col];
+                            if (colDef === undefined) {
+                                throw new Error(`Column ${col} not found`);
+                            }
+                            const encodedValue = Schema.encodeSync(colDef.schema)(value);
+                            bindValues.push(encodedValue);
+                        }
+                    });
+                    conflictClause += `DO UPDATE SET ${updates}`;
+                }
+            }
+        }
+        // Construct the main query part
+        let query = `${insertVerb} INTO '${ast.tableDef.sqliteDef.name}' (${columns.join(', ')}) VALUES (${placeholders})`;
+        // Append the conflict clause if it was generated (i.e., not for REPLACE)
+        query += conflictClause;
+        query += formatReturningClause(ast.returning);
+        return { query, bindValues };
+    }
+    // UPDATE query
+    if (ast._tag === 'UpdateQuery') {
+        const setColumns = Object.keys(ast.values);
+        if (setColumns.length === 0) {
+            console.warn(`UPDATE query requires at least one column to set (for table ${ast.tableDef.sqliteDef.name}). Running no-op query instead to skip this update query.`);
+            return { query: 'SELECT 1', bindValues: [] };
+            // return shouldNeverHappen('UPDATE query requires at least one column to set.')
+        }
+        const encodedValues = Schema.encodeSync(Schema.partial(ast.tableDef.rowSchema))(ast.values);
+        // Ensure bind values are added in the same order as columns
+        setColumns.forEach((col) => {
+            bindValues.push(encodedValues[col]);
+        });
+        let query = `UPDATE '${ast.tableDef.sqliteDef.name}' SET ${setColumns.map((col) => `${col} = ?`).join(', ')}`;
+        const whereClause = formatWhereClause(ast.where, ast.tableDef, bindValues);
+        if (whereClause)
+            query += ` ${whereClause}`;
+        query += formatReturningClause(ast.returning);
+        return { query, bindValues };
+    }
+    // DELETE query
+    if (ast._tag === 'DeleteQuery') {
+        let query = `DELETE FROM '${ast.tableDef.sqliteDef.name}'`;
+        const whereClause = formatWhereClause(ast.where, ast.tableDef, bindValues);
+        if (whereClause)
+            query += ` ${whereClause}`;
+        query += formatReturningClause(ast.returning);
+        return { query, bindValues };
+    }
+    // COUNT query
+    if (ast._tag === 'CountQuery') {
+        const query = [
+            `SELECT COUNT(*) as count FROM '${ast.tableDef.sqliteDef.name}'`,
+            formatWhereClause(ast.where, ast.tableDef, bindValues),
+        ]
+            .filter((clause) => clause.length > 0)
+            .join(' ');
+        return { query, bindValues };
+    }
+    // ROW query
+    if (ast._tag === 'RowQuery') {
+        // Handle the id value by encoding it with the id column schema
+        const idColDef = ast.tableDef.sqliteDef.columns.id;
+        if (idColDef === undefined) {
+            throw new Error('Column id not found for ROW query');
+        }
+        // NOTE we're not encoding the id if it's the session id symbol, which needs to be taken care of by the caller
+        const encodedId = ast.id === SessionIdSymbol ? ast.id : Schema.encodeSync(idColDef.schema)(ast.id);
+        return {
+            query: `SELECT * FROM '${ast.tableDef.sqliteDef.name}' WHERE id = ?`,
+            bindValues: [encodedId],
+        };
+    }
+    // SELECT query
+    const columnsStmt = ast.select.columns.length === 0 ? '*' : ast.select.columns.join(', ');
+    const selectStmt = `SELECT ${columnsStmt}`;
+    const fromStmt = `FROM '${ast.tableDef.sqliteDef.name}'`;
+    const whereStmt = formatWhereClause(ast.where, ast.tableDef, bindValues);
+    const orderByStmt = ast.orderBy.length > 0
+        ? `ORDER BY ${ast.orderBy.map(({ col, direction }) => `${col} ${direction}`).join(', ')}`
+        : '';
+    const limitStmt = ast.limit._tag === 'Some' ? `LIMIT ?` : '';
+    const offsetStmt = ast.offset._tag === 'Some' ? `OFFSET ?` : '';
+    // Push offset and limit values in the correct order matching the query string
+    if (ast.offset._tag === 'Some')
+        bindValues.push(ast.offset.value);
+    if (ast.limit._tag === 'Some')
+        bindValues.push(ast.limit.value);
+    const query = [selectStmt, fromStmt, whereStmt, orderByStmt, offsetStmt, limitStmt]
+        .map((clause) => clause.trim())
+        .filter((clause) => clause.length > 0)
+        .join(' ');
+    return { query, bindValues };
+};
+//# sourceMappingURL=astToSql.js.map

package/dist/query-builder/astToSql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"astToSql.js","sourceRoot":"","sources":["../../src/query-builder/astToSql.ts"],"names":[],"mappings":"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"}

package/dist/query-builder/impl.d.ts

@@ -1,12 +1,7 @@
 import { Schema } from '@livestore/utils/effect';
-import type { QueryInfo } from '../query-info.js';
-import type { DbSchema } from '../schema/mod.js';
+import type { State } from '../schema/mod.js';
 import type { QueryBuilder, QueryBuilderAst } from './api.js';
-export declare const makeQueryBuilder: <TResult, TTableDef extends DbSchema.TableDefBase>(tableDef: TTableDef, ast?: QueryBuilderAst) => QueryBuilder<TResult, TTableDef, never, QueryInfo.None>;
+export declare const makeQueryBuilder: <TResult, TTableDef extends State.SQLite.TableDefBase>(tableDef: TTableDef, ast?: QueryBuilderAst) => QueryBuilder<TResult, TTableDef, never>;
 export declare const invalidQueryBuilder: (msg?: string) => never;
-export declare const getResultSchema: (qb: QueryBuilder<any, any, any>) => Schema.Array$<Schema.Schema<any, any, never>> | Schema.SchemaClass<any, readonly any[], never> | Schema.SchemaClass<number, readonly {
-    readonly count: number;
-}[], never> | Schema.SchemaClass<any, readonly {
-    readonly value: any;
-}[], never>;
+export declare const getResultSchema: (qb: QueryBuilder<any, any, any>) => Schema.Schema<any>;
 //# sourceMappingURL=impl.d.ts.map

package/dist/query-builder/impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"impl.d.ts","sourceRoot":"","sources":["../../src/query-builder/impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAG7D,eAAO,MAAM,gBAAgB,GAAI,OAAO,EAAE,SAAS,SAAS,QAAQ,CAAC,YAAY,YACrE,SAAS,QACd,eAAe,KACnB,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,CA6JxD,CAAA;AA+FD,eAAO,MAAM,mBAAmB,SAAU,MAAM,UAE/C,CAAA;AAED,eAAO,MAAM,eAAe,OAAQ,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;;;;WAkB9D,CAAA"}
+{"version":3,"file":"impl.d.ts","sourceRoot":"","sources":["../../src/query-builder/impl.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAE1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAI7D,eAAO,MAAM,gBAAgB,GAAI,OAAO,EAAE,SAAS,SAAS,KAAK,CAAC,MAAM,CAAC,YAAY,EACnF,UAAU,SAAS,EACnB,MAAK,eAAoC,KACxC,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CA2PxC,CAAA;AAuCD,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,UAE/C,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,IAAI,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CA4ClF,CAAA"}

package/dist/query-builder/impl.js

@@ -1,17 +1,20 @@
-import { Option, Predicate, Schema } from '@livestore/utils/effect';
-import { QueryBuilderAstSymbol, TypeId } from './api.js';
+import { casesHandled, shouldNeverHappen } from '@livestore/utils';
+import { Match, Option, Predicate, Schema } from '@livestore/utils/effect';
+import { QueryBuilderAstSymbol, QueryBuilderTypeId } from './api.js';
+import { astToSql } from './astToSql.js';
 export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
     const api = {
         // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
         select() {
-            assertQueryBuilderAst(ast);
+            assertSelectQueryBuilderAst(ast);
             // eslint-disable-next-line prefer-rest-params
             const params = [...arguments];
-            if (params.length === 2 && typeof params[0] === 'string' && typeof params[1] === 'object') {
-                const [col, options] = params;
+            // Pluck if there's only one column selected
+            if (params.length === 1) {
+                const [col] = params;
                 return makeQueryBuilder(tableDef, {
                     ...ast,
-                    resultSchemaSingle: options.pluck ? ast.resultSchemaSingle.pipe(Schema.pluck(col)) : ast.resultSchemaSingle,
+                    resultSchemaSingle: ast.resultSchemaSingle.pipe(Schema.pluck(col)),
                     select: { columns: [col] },
                 });
             }
@@ -23,9 +26,11 @@ export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
             });
         },
         // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
-        where() {
-            if (isRowQuery(ast))
-                return invalidQueryBuilder();
+        where: function () {
+            if (ast._tag === 'InsertQuery')
+                return invalidQueryBuilder('Cannot use where with insert');
+            if (ast._tag === 'RowQuery')
+                return invalidQueryBuilder('Cannot use where with row');
             if (arguments.length === 1) {
                 // eslint-disable-next-line prefer-rest-params
                 const params = arguments[0];
@@ -34,23 +39,43 @@ export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
                     .map(([col, value]) => Predicate.hasProperty(value, 'op') && Predicate.hasProperty(value, 'value')
                     ? { col, op: value.op, value: value.value }
                     : { col, op: '=', value });
-                return makeQueryBuilder(tableDef, {
-                    ...ast,
-                    where: [...ast.where, ...newOps],
-                });
+                switch (ast._tag) {
+                    case 'CountQuery':
+                    case 'SelectQuery':
+                    case 'UpdateQuery':
+                    case 'DeleteQuery': {
+                        return makeQueryBuilder(tableDef, {
+                            ...ast,
+                            where: [...ast.where, ...newOps],
+                        });
+                    }
+                    default: {
+                        return casesHandled(ast);
+                    }
+                }
             }
             // eslint-disable-next-line prefer-rest-params
             const [col, opOrValue, valueOrUndefined] = arguments;
             const op = valueOrUndefined === undefined ? '=' : opOrValue;
             const value = valueOrUndefined === undefined ? opOrValue : valueOrUndefined;
-            return makeQueryBuilder(tableDef, {
-                ...ast,
-                where: [...ast.where, { col, op, value }],
-            });
+            switch (ast._tag) {
+                case 'CountQuery':
+                case 'SelectQuery':
+                case 'UpdateQuery':
+                case 'DeleteQuery': {
+                    return makeQueryBuilder(tableDef, {
+                        ...ast,
+                        where: [...ast.where, { col, op, value }],
+                    });
+                }
+                default: {
+                    return casesHandled(ast);
+                }
+            }
         },
         // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
         orderBy() {
-            assertQueryBuilderAst(ast);
+            assertSelectQueryBuilderAst(ast);
             if (arguments.length === 0 || arguments.length > 2)
                 return invalidQueryBuilder();
             if (arguments.length === 1) {
@@ -69,60 +94,108 @@ export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
             });
         },
         limit: (limit) => {
-            assertQueryBuilderAst(ast);
+            assertSelectQueryBuilderAst(ast);
             return makeQueryBuilder(tableDef, { ...ast, limit: Option.some(limit) });
         },
         offset: (offset) => {
-            assertQueryBuilderAst(ast);
+            assertSelectQueryBuilderAst(ast);
             return makeQueryBuilder(tableDef, { ...ast, offset: Option.some(offset) });
         },
         count: () => {
             if (isRowQuery(ast))
                 return invalidQueryBuilder();
             return makeQueryBuilder(tableDef, {
-                ...ast,
-                resultSchema: Schema.Struct({ count: Schema.Number }).pipe(Schema.pluck('count'), Schema.Array, Schema.headOrElse()),
                 _tag: 'CountQuery',
+                tableDef,
+                where: [],
+                resultSchema: Schema.Struct({ count: Schema.Number }).pipe(Schema.pluck('count'), Schema.Array, Schema.headOrElse()),
             });
         },
         first: (options) => {
-            assertQueryBuilderAst(ast);
+            assertSelectQueryBuilderAst(ast);
             if (ast.limit._tag === 'Some')
                 return invalidQueryBuilder(`.first() can't be called after .limit()`);
             return makeQueryBuilder(tableDef, {
                 ...ast,
                 limit: Option.some(1),
-                // TODO improve
-                pickFirst: options?.fallback ? { fallback: options.fallback } : { fallback: () => undefined },
+                pickFirst: options?.fallback ? { fallback: options.fallback } : 'no-fallback',
             });
         },
-        // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
-        row() {
-            // eslint-disable-next-line prefer-rest-params
-            const params = [...arguments];
-            let id;
-            if (tableDef.options.isSingleton) {
-                id = tableDef.sqliteDef.columns.id.default.pipe(Option.getOrThrow);
-            }
-            else {
-                id = params[0];
-                if (id === undefined) {
-                    invalidQueryBuilder(`Id missing for row query on non-singleton table ${tableDef.sqliteDef.name}`);
-                }
-            }
-            // TODO validate all required columns are present and values are matching the schema
-            const insertValues = params[1]?.insertValues ?? {};
+        // // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
+        // getOrCreate() {
+        //   if (tableDef.options.isClientDocumentTable === false) {
+        //     return invalidQueryBuilder(`getOrCreate() is not allowed when table is not a client document table`)
+        //   }
+        //   // eslint-disable-next-line prefer-rest-params
+        //   const params = [...arguments]
+        //   let id: string | number
+        //   // TODO refactor to handle default id
+        //   id = params[0] as string | number
+        //   if (id === undefined) {
+        //     invalidQueryBuilder(`Id missing for row query on non-singleton table ${tableDef.sqliteDef.name}`)
+        //   }
+        //   // TODO validate all required columns are present and values are matching the schema
+        //   const insertValues: Record<string, unknown> = params[1]?.insertValues ?? {}
+        //   return makeQueryBuilder(tableDef, {
+        //     _tag: 'RowQuery',
+        //     id,
+        //     tableDef,
+        //     insertValues,
+        //   }) as any
+        // },
+        insert: (values) => {
+            const filteredValues = Object.fromEntries(Object.entries(values).filter(([, value]) => value !== undefined));
+            return makeQueryBuilder(tableDef, {
+                _tag: 'InsertQuery',
+                tableDef,
+                values: filteredValues,
+                onConflict: undefined,
+                returning: undefined,
+                resultSchema: Schema.Void,
+            });
+        },
+        onConflict: (targetOrTargets, action, updateValues) => {
+            const targets = Array.isArray(targetOrTargets) ? targetOrTargets : [targetOrTargets];
+            assertInsertQueryBuilderAst(ast);
+            const onConflict = Match.value(action).pipe(Match.when('ignore', () => ({ targets, action: { _tag: 'ignore' } })), Match.when('replace', () => ({ targets, action: { _tag: 'replace' } })), Match.when('update', () => ({ targets, action: { _tag: 'update', update: updateValues } })), Match.exhaustive);
+            return makeQueryBuilder(tableDef, {
+                ...ast,
+                onConflict,
+            });
+        },
+        returning: (...columns) => {
+            assertWriteQueryBuilderAst(ast);
             return makeQueryBuilder(tableDef, {
-                _tag: 'RowQuery',
-                id,
+                ...ast,
+                returning: columns,
+                resultSchema: tableDef.rowSchema.pipe(Schema.pick(...columns), Schema.Array),
+            });
+        },
+        update: (values) => {
+            const filteredValues = Object.fromEntries(Object.entries(values).filter(([, value]) => value !== undefined));
+            return makeQueryBuilder(tableDef, {
+                _tag: 'UpdateQuery',
+                tableDef,
+                values: filteredValues,
+                where: [],
+                returning: undefined,
+                resultSchema: Schema.Void,
+            });
+        },
+        delete: () => {
+            return makeQueryBuilder(tableDef, {
+                _tag: 'DeleteQuery',
                 tableDef,
-                insertValues,
+                where: [],
+                returning: undefined,
+                resultSchema: Schema.Void,
             });
         },
     };
     return {
-        [TypeId]: TypeId,
+        [QueryBuilderTypeId]: QueryBuilderTypeId,
         [QueryBuilderAstSymbol]: ast,
+        ['ResultType']: 'only-for-type-inference',
         asSql: () => astToSql(ast),
         toString: () => {
             try {
@@ -146,98 +219,67 @@ const emptyAst = (tableDef) => ({
     limit: Option.none(),
     tableDef,
     where: [],
-    resultSchemaSingle: tableDef.schema,
+    resultSchemaSingle: tableDef.rowSchema,
 });
-const astToSql = (ast) => {
-    if (isRowQuery(ast)) {
-        // TODO
-        return { query: `SELECT * FROM '${ast.tableDef.sqliteDef.name}' WHERE id = ?`, bindValues: [ast.id] };
+// Helper functions
+// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
+function assertSelectQueryBuilderAst(ast) {
+    if (ast._tag !== 'SelectQuery') {
+        return shouldNeverHappen('Expected SelectQuery but got ' + ast._tag);
     }
-    const bindValues = [];
-    // TODO bind values
-    const whereStmt = ast.where.length > 0
-        ? `WHERE ${ast.where
-            .map(({ col, op, value }) => {
-            if (value === null) {
-                if (op !== '=' && op !== '!=') {
-                    throw new Error(`Unsupported operator for NULL value: ${op}`);
-                }
-                const opStmt = op === '=' ? 'IS' : 'IS NOT';
-                return `${col} ${opStmt} NULL`;
-            }
-            else {
-                const colDef = ast.tableDef.sqliteDef.columns[col];
-                if (colDef === undefined) {
-                    throw new Error(`Column ${col} not found`);
-                }
-                const isArray = op === 'IN' || op === 'NOT IN';
-                const colSchema = isArray ? Schema.Array(colDef.schema) : colDef.schema;
-                const encodedValue = Schema.encodeSync(colSchema)(value);
-                if (isArray) {
-                    bindValues.push(...encodedValue);
-                    const placeholders = Array.from({ length: encodedValue.length }, () => '?').join(', ');
-                    return `${col} ${op} (${placeholders})`;
-                }
-                else {
-                    bindValues.push(encodedValue);
-                    return `${col} ${op} ?`;
-                }
-            }
-        })
-            .join(' AND ')}`
-        : '';
-    if (ast._tag === 'CountQuery') {
-        const selectFromStmt = `SELECT COUNT(*) as count FROM '${ast.tableDef.sqliteDef.name}'`;
-        const query = [selectFromStmt, whereStmt].filter((_) => _.length > 0).join(' ');
-        return { query, bindValues };
+}
+// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
+function assertInsertQueryBuilderAst(ast) {
+    if (ast._tag !== 'InsertQuery') {
+        return shouldNeverHappen('Expected InsertQuery but got ' + ast._tag);
     }
-    const columnsStmt = ast.select.columns.length === 0 ? '*' : ast.select.columns.join(', ');
-    const selectStmt = `SELECT ${columnsStmt}`;
-    const fromStmt = `FROM '${ast.tableDef.sqliteDef.name}'`;
-    const orderByStmt = ast.orderBy.length > 0
-        ? `ORDER BY ${ast.orderBy.map(({ col, direction }) => `${col} ${direction}`).join(', ')}`
-        : '';
-    const limitStmt = ast.limit._tag === 'Some' ? `LIMIT ?` : '';
-    if (ast.limit._tag === 'Some')
-        bindValues.push(ast.limit.value);
-    const offsetStmt = ast.offset._tag === 'Some' ? `OFFSET ?` : '';
-    if (ast.offset._tag === 'Some')
-        bindValues.push(ast.offset.value);
-    const query = [selectStmt, fromStmt, whereStmt, orderByStmt, offsetStmt, limitStmt]
-        .map((_) => _.trim())
-        .filter((_) => _.length > 0)
-        .join(' ');
-    // TODO bind values
-    return { query, bindValues };
-};
+}
 // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
-function assertQueryBuilderAst(ast) {
-    if (ast._tag !== 'SelectQuery') {
-        throw new Error('Expected SelectQuery but got ' + ast._tag);
+function assertWriteQueryBuilderAst(ast) {
+    if (ast._tag !== 'InsertQuery' && ast._tag !== 'UpdateQuery' && ast._tag !== 'DeleteQuery') {
+        return shouldNeverHappen('Expected WriteQuery but got ' + ast._tag);
     }
 }
 const isRowQuery = (ast) => ast._tag === 'RowQuery';
 export const invalidQueryBuilder = (msg) => {
-    throw new Error('Invalid query builder' + (msg ? `: ${msg}` : ''));
+    return shouldNeverHappen('Invalid query builder' + (msg ? `: ${msg}` : ''));
 };
 export const getResultSchema = (qb) => {
     const queryAst = qb[QueryBuilderAstSymbol];
-    if (queryAst._tag === 'SelectQuery') {
-        const arraySchema = Schema.Array(queryAst.resultSchemaSingle);
-        if (queryAst.pickFirst !== false) {
-            return arraySchema.pipe(Schema.headOrElse(queryAst.pickFirst.fallback));
+    switch (queryAst._tag) {
+        case 'SelectQuery': {
+            const arraySchema = Schema.Array(queryAst.resultSchemaSingle);
+            if (queryAst.pickFirst === false) {
+                return arraySchema;
+            }
+            else if (queryAst.pickFirst === 'no-fallback') {
+                // Will throw if the array is empty
+                return arraySchema.pipe(Schema.headOrElse());
+            }
+            else {
+                const fallbackValue = queryAst.pickFirst.fallback();
+                return Schema.Union(arraySchema, Schema.Tuple(Schema.Literal(fallbackValue))).pipe(Schema.headOrElse(() => fallbackValue));
+            }
         }
-        return arraySchema;
-    }
-    else if (queryAst._tag === 'CountQuery') {
-        return Schema.Struct({ count: Schema.Number }).pipe(Schema.pluck('count'), Schema.Array, Schema.headOrElse());
-    }
-    else {
-        if (queryAst.tableDef.options.isSingleColumn) {
-            return queryAst.tableDef.schema.pipe(Schema.pluck('value'), Schema.Array, Schema.headOrElse());
+        case 'CountQuery': {
+            return Schema.Struct({ count: Schema.Number }).pipe(Schema.pluck('count'), Schema.Array, Schema.headOrElse());
+        }
+        case 'InsertQuery':
+        case 'UpdateQuery':
+        case 'DeleteQuery': {
+            // For write operations with RETURNING clause, we need to return the appropriate schema
+            if (queryAst.returning && queryAst.returning.length > 0) {
+                // Create a schema for the returned columns
+                return queryAst.tableDef.rowSchema.pipe(Schema.pick(...queryAst.returning), Schema.Array);
+            }
+            // For write operations without RETURNING, the result is the number of affected rows
+            return Schema.Number;
+        }
+        case 'RowQuery': {
+            return queryAst.tableDef.rowSchema.pipe(Schema.pluck('value'), Schema.annotations({ title: `${queryAst.tableDef.sqliteDef.name}.value` }), Schema.Array, Schema.headOrElse());
         }
-        else {
-            return queryAst.tableDef.schema.pipe(Schema.Array, Schema.headOrElse());
+        default: {
+            casesHandled(queryAst);
         }
     }
 };