@livestore/common 0.0.0-snapshot-2ef046b02334f52613d31dbe06af53487685edc0 → 0.0.0-snapshot-8115ad48d5a57244358c943ecc92bb0a30274b87

package/dist/query-builder/impl.js

@@ -1,6 +1,6 @@
-import { casesHandled } from '@livestore/utils';
+import { casesHandled, shouldNeverHappen } from '@livestore/utils';
 import { Match, Option, Predicate, Schema } from '@livestore/utils/effect';
-import { QueryBuilderAstSymbol, TypeId } from './api.js';
+import { QueryBuilderAstSymbol, QueryBuilderTypeId } from './api.js';
 import { astToSql } from './astToSql.js';
 export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
     const api = {
@@ -9,11 +9,12 @@ export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
             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] },
                 });
             }
@@ -121,42 +122,43 @@ export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
                 pickFirst: options?.fallback ? { fallback: options.fallback } : { fallback: () => undefined },
             });
         },
-        // 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 ?? {};
-            return makeQueryBuilder(tableDef, {
-                _tag: 'RowQuery',
-                id,
-                tableDef,
-                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: values,
+                values: filteredValues,
                 onConflict: undefined,
                 returning: undefined,
                 resultSchema: Schema.Void,
             });
         },
-        onConflict: (target, action, updateValues) => {
+        onConflict: (targetOrTargets, action, updateValues) => {
+            const targets = Array.isArray(targetOrTargets) ? targetOrTargets : [targetOrTargets];
             assertInsertQueryBuilderAst(ast);
-            const onConflict = Match.value(action).pipe(Match.when('ignore', () => ({ target, action: { _tag: 'ignore' } })), Match.when('replace', () => ({ target, action: { _tag: 'replace' } })), Match.when('update', () => ({ target, action: { _tag: 'update', update: updateValues } })), Match.exhaustive);
+            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,
@@ -167,14 +169,15 @@ export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
             return makeQueryBuilder(tableDef, {
                 ...ast,
                 returning: columns,
-                resultSchema: tableDef.schema.pipe(Schema.pick(...columns), Schema.Array),
+                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: values,
+                values: filteredValues,
                 where: [],
                 returning: undefined,
                 resultSchema: Schema.Void,
@@ -191,8 +194,9 @@ export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
         },
     };
     return {
-        [TypeId]: TypeId,
+        [QueryBuilderTypeId]: QueryBuilderTypeId,
         [QueryBuilderAstSymbol]: ast,
+        ['ResultType']: 'only-for-type-inference',
         asSql: () => astToSql(ast),
         toString: () => {
             try {
@@ -216,30 +220,30 @@ const emptyAst = (tableDef) => ({
     limit: Option.none(),
     tableDef,
     where: [],
-    resultSchemaSingle: tableDef.schema,
+    resultSchemaSingle: tableDef.rowSchema,
 });
 // Helper functions
 // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
 function assertSelectQueryBuilderAst(ast) {
     if (ast._tag !== 'SelectQuery') {
-        throw new Error('Expected SelectQuery but got ' + ast._tag);
+        return shouldNeverHappen('Expected SelectQuery but got ' + ast._tag);
     }
 }
 // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
 function assertInsertQueryBuilderAst(ast) {
     if (ast._tag !== 'InsertQuery') {
-        throw new Error('Expected InsertQuery but got ' + ast._tag);
+        return shouldNeverHappen('Expected InsertQuery but got ' + ast._tag);
     }
 }
 // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
 function assertWriteQueryBuilderAst(ast) {
     if (ast._tag !== 'InsertQuery' && ast._tag !== 'UpdateQuery' && ast._tag !== 'DeleteQuery') {
-        throw new Error('Expected WriteQuery but got ' + ast._tag);
+        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];
@@ -260,18 +264,16 @@ export const getResultSchema = (qb) => {
             // 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.schema.pipe(Schema.pick(...queryAst.returning), Schema.Array);
+                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());
+        }
         default: {
-            if (queryAst.tableDef.options.isSingleColumn) {
-                return queryAst.tableDef.schema.pipe(Schema.pluck('value'), Schema.Array, Schema.headOrElse());
-            }
-            else {
-                return queryAst.tableDef.schema.pipe(Schema.Array, Schema.headOrElse());
-            }
+            casesHandled(queryAst);
         }
     }
 };

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

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

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

@@ -1,2 +1,87 @@
-export {};
+import { Schema } from '@livestore/utils/effect';
+import { State } from '../schema/mod.js';
+export declare const issue: State.SQLite.TableDef<{
+    name: "issue";
+    columns: {
+        readonly id: {
+            columnType: "integer";
+            schema: Schema.Schema<number, number, never>;
+            default: import("effect/Option").None<never>;
+            nullable: false;
+            primaryKey: true;
+        };
+        readonly title: {
+            columnType: "text";
+            schema: Schema.Schema<string, string, never>;
+            default: import("effect/Option").Some<"">;
+            nullable: false;
+            primaryKey: false;
+        };
+        readonly creator: {
+            columnType: "text";
+            schema: Schema.Schema<string, string, never>;
+            default: import("effect/Option").Some<"">;
+            nullable: false;
+            primaryKey: false;
+        };
+        readonly priority: {
+            columnType: "integer";
+            schema: Schema.Schema<0 | 2 | 1 | 3 | 4, 0 | 2 | 1 | 3 | 4, never>;
+            default: import("effect/Option").Some<0>;
+            nullable: false;
+            primaryKey: false;
+        };
+        readonly created: {
+            columnType: "integer";
+            schema: Schema.Schema<Date, number, never>;
+            default: import("effect/Option").None<never>;
+            nullable: false;
+            primaryKey: false;
+        };
+        readonly deleted: {
+            columnType: "integer";
+            schema: Schema.Schema<Date | null, number | null, never>;
+            default: import("effect/Option").None<never>;
+            nullable: true;
+            primaryKey: false;
+        };
+        readonly modified: {
+            columnType: "integer";
+            schema: Schema.Schema<Date, number, never>;
+            default: import("effect/Option").None<never>;
+            nullable: false;
+            primaryKey: false;
+        };
+        readonly kanbanorder: {
+            columnType: "text";
+            schema: Schema.Schema<string, string, never>;
+            default: import("effect/Option").Some<"">;
+            nullable: false;
+            primaryKey: false;
+        };
+    };
+    indexes?: ReadonlyArray<import("../schema/db-schema/dsl/mod.js").Index>;
+    ast: import("../schema/db-schema/ast/sqlite.js").Table;
+}, {
+    isClientDocumentTable: false;
+    requiredInsertColumnNames: "id" | "created" | "modified";
+}, Schema.Schema<{
+    readonly id: number;
+    readonly title: string;
+    readonly creator: string;
+    readonly priority: 0 | 2 | 1 | 3 | 4;
+    readonly created: Date;
+    readonly deleted: Date | null;
+    readonly modified: Date;
+    readonly kanbanorder: string;
+}, {
+    readonly id: number;
+    readonly title: string;
+    readonly creator: string;
+    readonly priority: 0 | 2 | 1 | 3 | 4;
+    readonly created: number;
+    readonly deleted: number | null;
+    readonly modified: number;
+    readonly kanbanorder: string;
+}, never>>;
 //# sourceMappingURL=impl.test.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"impl.test.d.ts","sourceRoot":"","sources":["../../src/query-builder/impl.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"impl.test.d.ts","sourceRoot":"","sources":["../../src/query-builder/impl.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAqDxC,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAgBhB,CAAA"}

package/dist/query-builder/impl.test.js

@@ -1,27 +1,70 @@
 import { Schema } from '@livestore/utils/effect';
 import { describe, expect, it } from 'vitest';
-import { DbSchema } from '../schema/mod.js';
+import { State } from '../schema/mod.js';
 import { getResultSchema } from './impl.js';
-const todos = DbSchema.table('todos', {
-    id: DbSchema.text({ primaryKey: true }),
-    text: DbSchema.text({ default: '', nullable: false }),
-    completed: DbSchema.boolean({ default: false, nullable: false }),
-    status: DbSchema.text({ schema: Schema.Literal('active', 'completed') }),
-    deletedAt: DbSchema.datetime({ nullable: true }),
-    // TODO consider leaning more into Effect schema
-    // other: Schema.Number.pipe(DbSchema.asInteger),
-}, { deriveMutations: true });
-const todosWithIntId = DbSchema.table('todos_with_int_id', {
-    id: DbSchema.integer({ primaryKey: true }),
-    text: DbSchema.text({ default: '', nullable: false }),
-    status: DbSchema.text({ schema: Schema.Literal('active', 'completed') }),
-}, { deriveMutations: true });
-const comments = DbSchema.table('comments', {
-    id: DbSchema.text({ primaryKey: true }),
-    text: DbSchema.text({ default: '', nullable: false }),
-    todoId: DbSchema.text({}),
+const todos = State.SQLite.table({
+    name: 'todos',
+    columns: {
+        id: State.SQLite.text({ primaryKey: true }),
+        text: State.SQLite.text({ default: '', nullable: false }),
+        completed: State.SQLite.boolean({ default: false, nullable: false }),
+        status: State.SQLite.text({ schema: Schema.Literal('active', 'completed') }),
+        deletedAt: State.SQLite.datetime({ nullable: true }),
+        // TODO consider leaning more into Effect schema
+        // other: Schema.Number.pipe(State.SQLite.asInteger),
+    },
 });
-const db = { todos: todos.query, todosWithIntId: todosWithIntId.query, comments: comments.query };
+const todosWithIntId = State.SQLite.table({
+    name: 'todos_with_int_id',
+    columns: {
+        id: State.SQLite.integer({ primaryKey: true }),
+        text: State.SQLite.text({ default: '', nullable: false }),
+        status: State.SQLite.text({ schema: Schema.Literal('active', 'completed') }),
+    },
+});
+const comments = State.SQLite.table({
+    name: 'comments',
+    columns: {
+        id: State.SQLite.text({ primaryKey: true }),
+        text: State.SQLite.text({ default: '', nullable: false }),
+        todoId: State.SQLite.text({}),
+    },
+});
+const UiState = State.SQLite.clientDocument({
+    name: 'UiState',
+    schema: Schema.Struct({
+        filter: Schema.Literal('all', 'active', 'completed'),
+    }),
+    default: { value: { filter: 'all' } },
+});
+const UiStateWithDefaultId = State.SQLite.clientDocument({
+    name: 'UiState',
+    schema: Schema.Struct({
+        filter: Schema.Literal('all', 'active', 'completed'),
+    }),
+    default: {
+        id: 'static',
+        value: { filter: 'all' },
+    },
+});
+export const issue = State.SQLite.table({
+    name: 'issue',
+    columns: {
+        id: State.SQLite.integer({ primaryKey: true }),
+        title: State.SQLite.text({ default: '' }),
+        creator: State.SQLite.text({ default: '' }),
+        priority: State.SQLite.integer({ schema: Schema.Literal(0, 1, 2, 3, 4), default: 0 }),
+        created: State.SQLite.integer({ schema: Schema.DateFromNumber }),
+        deleted: State.SQLite.integer({ nullable: true, schema: Schema.DateFromNumber }),
+        modified: State.SQLite.integer({ schema: Schema.DateFromNumber }),
+        kanbanorder: State.SQLite.text({ nullable: false, default: '' }),
+    },
+    indexes: [
+        { name: 'issue_kanbanorder', columns: ['kanbanorder'] },
+        { name: 'issue_created', columns: ['created'] },
+    ],
+});
+const db = { todos, todosWithIntId, comments, issue, UiState, UiStateWithDefaultId };
 describe('query builder', () => {
     describe('result schema', () => {
         it('should print the schema', () => {
@@ -35,6 +78,12 @@ describe('query builder', () => {
           "bindValues": [],
           "query": "SELECT * FROM 'todos'",
         }
+      `);
+            expect(db.todos.select('id').asSql()).toMatchInlineSnapshot(`
+        {
+          "bindValues": [],
+          "query": "SELECT id FROM 'todos'",
+        }
       `);
             expect(db.todos.select('id', 'text').asSql()).toMatchInlineSnapshot(`
         {
@@ -122,6 +171,39 @@ describe('query builder', () => {
           }
         `);
         });
+        it('should handle OFFSET and LIMIT clauses correctly', () => {
+            // Test with both offset and limit
+            expect(db.todos.select('id', 'text').where('completed', true).offset(5).limit(10).asSql()).toMatchInlineSnapshot(`
+          {
+            "bindValues": [
+              1,
+              5,
+              10,
+            ],
+            "query": "SELECT id, text FROM 'todos' WHERE completed = ? OFFSET ? LIMIT ?",
+          }
+        `);
+            // Test with only offset
+            expect(db.todos.select('id', 'text').where('completed', true).offset(5).asSql()).toMatchInlineSnapshot(`
+          {
+            "bindValues": [
+              1,
+              5,
+            ],
+            "query": "SELECT id, text FROM 'todos' WHERE completed = ? OFFSET ?",
+          }
+        `);
+            // Test with only limit
+            expect(db.todos.select('id', 'text').where('completed', true).limit(10).asSql()).toMatchInlineSnapshot(`
+          {
+            "bindValues": [
+              1,
+              10,
+            ],
+            "query": "SELECT id, text FROM 'todos' WHERE completed = ? LIMIT ?",
+          }
+        `);
+        });
         it('should handle COUNT queries', () => {
             expect(db.todos.count().asSql()).toMatchInlineSnapshot(`
         {
@@ -173,38 +255,86 @@ describe('query builder', () => {
       `);
         });
     });
-    describe('row queries', () => {
-        it('should handle row queries', () => {
-            expect(db.todos.row('123', { insertValues: { status: 'completed' } }).asSql()).toMatchInlineSnapshot(`
+    // describe('getOrCreate queries', () => {
+    //   it('should handle getOrCreate queries', () => {
+    //     expect(db.UiState.getOrCreate('sessionid-1').asSql()).toMatchInlineSnapshot(`
+    //         {
+    //           "bindValues": [
+    //             "sessionid-1",
+    //           ],
+    //           "query": "SELECT * FROM 'UiState' WHERE id = ?",
+    //         }
+    //       `)
+    //   })
+    //   it('should handle getOrCreate queries with default id', () => {
+    //     expect(db.UiStateWithDefaultId.getOrCreate().asSql()).toMatchInlineSnapshot(`
+    //       {
+    //         "bindValues": [],
+    //         "query": "SELECT * FROM 'UiState' WHERE id = ?",
+    //       }
+    //     `)
+    //   })
+    //   // it('should handle row queries with numbers', () => {
+    //   //   expect(db.todosWithIntId.getOrCreate(123, { insertValues: { status: 'active' } }).asSql()).toMatchInlineSnapshot(`
+    //   //     {
+    //   //       "bindValues": [
+    //   //         123,
+    //   //       ],
+    //   //       "query": "SELECT * FROM 'todos_with_int_id' WHERE id = ?",
+    //   //     }
+    //   //   `)
+    //   // })
+    // })
+    describe('write operations', () => {
+        it('should handle INSERT queries', () => {
+            expect(db.todos.insert({ id: '123', text: 'Buy milk', status: 'active' }).asSql()).toMatchInlineSnapshot(`
         {
           "bindValues": [
             "123",
+            "Buy milk",
+            "active",
           ],
-          "query": "SELECT * FROM 'todos' WHERE id = ?",
+          "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?)",
         }
       `);
         });
-        it('should handle row queries with numbers', () => {
-            expect(db.todosWithIntId.row(123, { insertValues: { status: 'active' } }).asSql()).toMatchInlineSnapshot(`
+        it('should handle INSERT queries with undefined values', () => {
+            expect(db.todos.insert({ id: '123', text: 'Buy milk', status: 'active', completed: undefined }).asSql())
+                .toMatchInlineSnapshot(`
         {
           "bindValues": [
-            123,
+            "123",
+            "Buy milk",
+            "active",
           ],
-          "query": "SELECT * FROM 'todos_with_int_id' WHERE id = ?",
+          "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?)",
         }
       `);
         });
-    });
-    describe('write operations', () => {
-        it('should handle INSERT queries', () => {
-            expect(db.todos.insert({ id: '123', text: 'Buy milk', status: 'active' }).asSql()).toMatchInlineSnapshot(`
+        // Test helped to catch a bindValues ordering bug
+        it('should handle INSERT queries (issue)', () => {
+            expect(db.issue
+                .insert({
+                id: 1,
+                title: 'Revert the user profile page',
+                priority: 2,
+                created: new Date('2024-08-01T17:15:20.507Z'),
+                modified: new Date('2024-12-29T17:15:20.507Z'),
+                kanbanorder: 'a2',
+                creator: 'John Doe',
+            })
+                .asSql()).toMatchInlineSnapshot(`
         {
           "bindValues": [
-            "123",
-            "Buy milk",
-            "active",
+            1,
+            "Revert the user profile page",
+            2,
+            1722532520507,
+            1735492520507,
+            "a2",
+            "John Doe",
           ],
-          "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?)",
+          "query": "INSERT INTO 'issue' (id, title, priority, created, modified, kanbanorder, creator) VALUES (?, ?, ?, ?, ?, ?, ?)",
         }
       `);
         });
@@ -217,6 +347,37 @@ describe('query builder', () => {
           ],
           "query": "UPDATE 'todos' SET status = ? WHERE id = ?",
         }
+      `);
+            // empty update set
+            expect(db.todos.update({}).where({ id: '123' }).asSql()).toMatchInlineSnapshot(`
+        {
+          "bindValues": [],
+          "query": "SELECT 1",
+        }
+      `);
+        });
+        it('should handle UPDATE queries with undefined values', () => {
+            expect(db.todos.update({ status: undefined, text: 'some text' }).where({ id: '123' }).asSql())
+                .toMatchInlineSnapshot(`
+        {
+          "bindValues": [
+            "some text",
+            "123",
+          ],
+          "query": "UPDATE 'todos' SET text = ? WHERE id = ?",
+        }
+      `);
+        });
+        it('should handle UPDATE queries with undefined values (issue)', () => {
+            expect(db.issue.update({ priority: 2, creator: 'John Doe' }).where({ id: 1 }).asSql()).toMatchInlineSnapshot(`
+        {
+          "bindValues": [
+            2,
+            "John Doe",
+            1,
+          ],
+          "query": "UPDATE 'issue' SET priority = ?, creator = ? WHERE id = ?",
+        }
       `);
         });
         it('should handle DELETE queries', () => {
@@ -255,6 +416,32 @@ describe('query builder', () => {
           ],
           "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?) ON CONFLICT (id) DO UPDATE SET text = ?, status = ?",
         }
+      `);
+            expect(db.todos.insert({ id: '123', text: 'Buy milk', status: 'active' }).onConflict('id', 'replace').asSql())
+                .toMatchInlineSnapshot(`
+        {
+          "bindValues": [
+            "123",
+            "Buy milk",
+            "active",
+          ],
+          "query": "INSERT OR REPLACE INTO 'todos' (id, text, status) VALUES (?, ?, ?)",
+        }
+      `);
+        });
+        it('should handle ON CONFLICT with multiple columns', () => {
+            expect(db.todos
+                .insert({ id: '123', text: 'Buy milk', status: 'active' })
+                .onConflict(['id', 'status'], 'ignore')
+                .asSql()).toMatchInlineSnapshot(`
+        {
+          "bindValues": [
+            "123",
+            "Buy milk",
+            "active",
+          ],
+          "query": "INSERT INTO 'todos' (id, text, status) VALUES (?, ?, ?) ON CONFLICT (id, status) DO NOTHING",
+        }
       `);
         });
         it('should handle RETURNING clause', () => {