@fragno-dev/db 0.1.13 → 0.1.15

package/src/adapters/kysely/kysely-uow-compiler.test.ts

@@ -1,10 +1,7 @@
-import { Kysely, PostgresDialect } from "kysely";
-import { assert, beforeAll, describe, expect, it } from "vitest";
+import { assert, describe, expect, it } from "vitest";
 import { column, FragnoId, idColumn, referenceColumn, schema } from "../../schema/create";
 import { UnitOfWork, type UOWDecoder } from "../../query/unit-of-work";
 import { createKyselyUOWCompiler } from "./kysely-uow-compiler";
-import type { ConnectionPool } from "../../shared/connection-pool";
-import { createKyselyConnectionPool } from "./kysely-connection-pool";
 import { Cursor } from "../../query/cursor";
 
 describe("kysely-uow-compiler", () => {
@@ -86,47 +83,21 @@ describe("kysely-uow-compiler", () => {
       });
   });
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let kysely: Kysely<any>;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let pool: ConnectionPool<Kysely<any>>;
-
-  beforeAll(() => {
-    // Create a mock Kysely instance (we won't execute queries, just compile them)
-    // We need a minimal pool that won't actually connect
-    const mockPool = {
-      connect: () => Promise.reject(new Error("Mock pool - no actual connections")),
-      end: () => Promise.resolve(),
-      on: () => {},
-    };
-
-    kysely = new Kysely({
-      dialect: new PostgresDialect({
-        // Safe: we're only compiling queries, not executing them
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        pool: mockPool as any,
-      }),
-    });
-
-    // Wrap in connection pool
-    pool = createKyselyConnectionPool(kysely);
-  });
-
   // Helper to create UnitOfWork for testing
   function createTestUOW(name?: string) {
-    const mockCompiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+    const mockCompiler = createKyselyUOWCompiler("postgresql");
     const mockExecutor = {
       executeRetrievalPhase: async () => [],
       executeMutationPhase: async () => ({ success: true, createdInternalIds: [] }),
     };
-    const mockDecoder: UOWDecoder<typeof testSchema> = (rawResults, operations) => {
+    const mockDecoder: UOWDecoder = (rawResults, operations) => {
       if (rawResults.length !== operations.length) {
         throw new Error("rawResults and ops must have the same length");
       }
       return rawResults;
     };
     // Pass undefined for decoder since we're only testing compilation, not execution
-    return new UnitOfWork(testSchema, mockCompiler, mockExecutor, mockDecoder, name);
+    return new UnitOfWork(mockCompiler, mockExecutor, mockDecoder, name).forSchema(testSchema);
   }
 
   describe("compileRetrievalOperation", () => {
@@ -136,7 +107,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("idx_email", (eb) => eb("email", "=", "test@example.com")),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -152,7 +123,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("idx_name", (eb) => eb("name", "=", "Alice")).select(["id", "name"]),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -166,7 +137,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary").pageSize(10));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -180,7 +151,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary").orderByIndex("primary", "desc"));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -193,7 +164,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("idx_name").orderByIndex("idx_name", "desc"));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -209,7 +180,7 @@ describe("kysely-uow-compiler", () => {
       );
       uow.find("posts", (b) => b.whereIndex("idx_title", (eb) => eb("title", "contains", "test")));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(2);
@@ -228,7 +199,7 @@ describe("kysely-uow-compiler", () => {
         return b;
       });
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -241,7 +212,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("idx_age", (eb) => eb("age", ">", 25)).selectCount());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -263,7 +234,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("idx_name").orderByIndex("idx_name", "asc").after(cursor).pageSize(10),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -285,7 +256,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("idx_name").orderByIndex("idx_name", "desc").before(cursor).pageSize(10),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -311,7 +282,7 @@ describe("kysely-uow-compiler", () => {
           .pageSize(5),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -331,7 +302,7 @@ describe("kysely-uow-compiler", () => {
         age: 30,
       });
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -357,7 +328,7 @@ describe("kysely-uow-compiler", () => {
         }),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -373,7 +344,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 5);
       uow.update("users", userId, (b) => b.set({ age: 18 }).check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -389,7 +360,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 0);
       uow.delete("users", userId);
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -405,7 +376,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 3);
       uow.delete("users", userId, (b) => b.check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -425,7 +396,7 @@ describe("kysely-uow-compiler", () => {
         }),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -440,7 +411,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.delete("users", "user123");
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -480,7 +451,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user456", 0);
       uow.delete("posts", userId);
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [createBatch, updateBatch, deleteBatch] = compiled.mutationBatch;
 
@@ -519,7 +490,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 3);
       uow.update("users", userId, (b) => b.set({ age: 31 }).check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.name).toBe("update-user-balance");
@@ -551,7 +522,7 @@ describe("kysely-uow-compiler", () => {
         ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -565,7 +536,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary", () => false));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       // When condition is false, the operation should return null and not be added to batch
@@ -576,7 +547,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary", () => true));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -593,7 +564,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 5);
       uow.update("users", userId, (b) => b.set({ age: 31 }).check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -610,7 +581,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user456", 3);
       uow.delete("users", userId, (b) => b.check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -630,7 +601,7 @@ describe("kysely-uow-compiler", () => {
       uow.update("users", userId, (b) => b.set({ age: 30 }).check());
       uow.update("posts", postId, (b) => b.set({ viewCount: 100 }).check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [userBatch, postBatch] = compiled.mutationBatch;
 
@@ -657,7 +628,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user1", 0);
       uow.update("users", userId, (b) => b.set({ age: 25 }));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -676,7 +647,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("primary").join((jb) => jb.author((ab) => ab.select(["name", "email"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -700,7 +671,7 @@ describe("kysely-uow-compiler", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -719,7 +690,7 @@ describe("kysely-uow-compiler", () => {
           .join((jb) => jb.author((ab) => ab.select(["name"]).orderByIndex("idx_name", "desc"))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -735,7 +706,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("primary").join((jb) => jb.author((ab) => ab.select(["name"]).pageSize(5))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -766,7 +737,7 @@ describe("kysely-uow-compiler", () => {
         ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -785,7 +756,7 @@ describe("kysely-uow-compiler", () => {
           .join((jb) => jb.post((pb) => pb.select(["title"])).author((ab) => ab.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -803,7 +774,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("primary").join((jb) => jb.inviter((ib) => ib.select(["name", "email"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -833,7 +804,7 @@ describe("kysely-uow-compiler", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -856,7 +827,7 @@ describe("kysely-uow-compiler", () => {
           .join((jb) => jb.post((pb) => pb.select(["title"])).tag((tb) => tb.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -881,7 +852,7 @@ describe("kysely-uow-compiler", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -897,7 +868,7 @@ describe("kysely-uow-compiler", () => {
     it("should handle UOW with no operations", () => {
       const uow = createTestUOW();
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(0);
@@ -908,7 +879,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users");
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -922,7 +893,7 @@ describe("kysely-uow-compiler", () => {
         email: "test@example.com",
       });
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(0);
@@ -949,7 +920,7 @@ describe("kysely-uow-compiler", () => {
         content: "This is my first post",
       });
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       // Should have no retrieval operations
@@ -994,5 +965,22 @@ describe("kysely-uow-compiler", () => {
         internalId: undefined,
       });
     });
+
+    it("should compile check operation", () => {
+      const uow = createTestUOW();
+      const userId = FragnoId.fromExternal("user123", 5);
+      uow.check("users", userId);
+
+      const compiler = createKyselyUOWCompiler("postgresql");
+      const compiled = uow.compile(compiler);
+      const [batch] = compiled.mutationBatch;
+      assert(batch);
+      expect(batch.expectedAffectedRows).toBe(null);
+      expect(batch.expectedReturnedRows).toBe(1);
+      expect(batch.query.sql).toMatchInlineSnapshot(
+        `"select 1 as "exists" from "users" where ("users"."id" = $1 and "users"."_version" = $2) limit $3"`,
+      );
+      expect(batch.query.parameters).toMatchObject(["user123", 5, 1]);
+    });
   });
 });

package/src/adapters/kysely/kysely-uow-compiler.ts

@@ -1,4 +1,4 @@
-import type { CompiledQuery, Kysely } from "kysely";
+import { type CompiledQuery, sql } from "kysely";
 import type { AnyColumn, AnySchema, FragnoId } from "../../schema/create";
 import type {
   CompiledMutation,
@@ -7,41 +7,69 @@ import type {
   UOWCompiler,
 } from "../../query/unit-of-work";
 import { createKyselyQueryCompiler } from "./kysely-query-compiler";
-import { createKyselyQueryBuilder } from "./kysely-query-builder";
+import { createKyselyQueryBuilder, buildWhere } from "./kysely-query-builder";
 import { buildCondition, type Condition } from "../../query/condition-builder";
 import { decodeCursor, serializeCursorValues } from "../../query/cursor";
 import type { AnySelectClause } from "../../query/query";
-import type { TableNameMapper } from "./kysely-shared";
-import type { ConnectionPool } from "../../shared/connection-pool";
+import { type TableNameMapper, createKysely, createTableNameMapper } from "./kysely-shared";
 import type { SQLProvider } from "../../shared/providers";
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type KyselyAny = Kysely<any>;
-
 /**
  * Create a Kysely-specific Unit of Work compiler
  *
  * This compiler translates UOW operations into Kysely CompiledQuery objects
  * that can be executed as a batch/transaction.
  *
- * @param schema - The database schema
  * @param pool - Connection pool for acquiring database connections
  * @param provider - SQL provider (postgresql, mysql, sqlite, etc.)
- * @param mapper - Optional table name mapper for namespace prefixing
+ * @param mapper - Optional table name mapper for namespace prefixing (fallback for operations without explicit namespace)
  * @returns A UOWCompiler instance for Kysely
  */
-export function createKyselyUOWCompiler<TSchema extends AnySchema>(
-  schema: TSchema,
-  pool: ConnectionPool<KyselyAny>,
+export function createKyselyUOWCompiler(
   provider: SQLProvider,
   mapper?: TableNameMapper,
-): UOWCompiler<TSchema, CompiledQuery> {
-  const queryCompiler = createKyselyQueryCompiler(schema, pool, provider, mapper);
+): UOWCompiler<CompiledQuery> {
   // Get kysely instance for query building (compilation doesn't execute, just builds SQL)
-  const kysely = pool.getDatabaseSync();
-  const queryBuilder = createKyselyQueryBuilder(kysely, provider, mapper);
+  const kysely = createKysely(provider);
+
+  /**
+   * Get the mapper for a specific operation
+   * Uses operation's namespace if provided, otherwise falls back to the default mapper
+   */
+  function getMapperForOperation(namespace: string | undefined): TableNameMapper | undefined {
+    if (namespace) {
+      return createTableNameMapper(namespace);
+    }
+    return mapper;
+  }
 
-  function toTable(name: unknown) {
+  // Cache query compilers and builders by namespace for performance
+  const compilerCache = new Map<string | undefined, ReturnType<typeof createKyselyQueryCompiler>>();
+  const builderCache = new Map<string | undefined, ReturnType<typeof createKyselyQueryBuilder>>();
+
+  function getQueryCompiler(schema: AnySchema, namespace: string | undefined) {
+    const cacheKey = namespace;
+    let compiler = compilerCache.get(cacheKey);
+    if (!compiler) {
+      const opMapper = getMapperForOperation(namespace);
+      compiler = createKyselyQueryCompiler(schema, provider, opMapper);
+      compilerCache.set(cacheKey, compiler);
+    }
+    return compiler;
+  }
+
+  function getQueryBuilder(namespace: string | undefined) {
+    const cacheKey = namespace;
+    let builder = builderCache.get(cacheKey);
+    if (!builder) {
+      const opMapper = getMapperForOperation(namespace);
+      builder = createKyselyQueryBuilder(kysely, provider, opMapper);
+      builderCache.set(cacheKey, builder);
+    }
+    return builder;
+  }
+
+  function toTable(schema: AnySchema, name: unknown) {
     const table = schema.tables[name as string];
     if (!table) {
       throw new Error(`Invalid table name ${name}.`);
@@ -50,7 +78,8 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
   }
 
   return {
-    compileRetrievalOperation(op: RetrievalOperation<TSchema>): CompiledQuery | null {
+    compileRetrievalOperation(op: RetrievalOperation<AnySchema>): CompiledQuery | null {
+      const queryCompiler = getQueryCompiler(op.schema, op.namespace);
       switch (op.type) {
         case "count": {
           return queryCompiler.count(op.table.name, {
@@ -159,14 +188,19 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
             }
           }
 
-          // When we have joins or need to bypass buildFindOptions, use queryBuilder directly
+          // For cursor pagination, fetch one extra item to determine if there's a next page
+          // Only apply this when using the high-level findWithCursor() API (op.withCursor === true)
+          const effectiveLimit = pageSize && op.withCursor ? pageSize + 1 : pageSize;
+
+          // When we have joins or need to bypass buildFindOptions, use operation-specific queryBuilder
           if (join && join.length > 0) {
+            const queryBuilder = getQueryBuilder(op.namespace);
             return queryBuilder.findMany(op.table, {
               // Safe cast: select from UOW matches SimplifyFindOptions requirement
               select: (findManyOptions.select ?? true) as AnySelectClause,
               where: combinedWhere,
               orderBy,
-              limit: pageSize,
+              limit: effectiveLimit,
               join,
             });
           }
@@ -175,25 +209,27 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
             ...findManyOptions,
             where: combinedWhere ? () => combinedWhere! : undefined,
             orderBy: orderBy?.map(([col, dir]) => [col.ormName, dir]),
-            limit: pageSize,
+            limit: effectiveLimit,
           });
         }
       }
     },
 
     compileMutationOperation(
-      op: MutationOperation<TSchema>,
+      op: MutationOperation<AnySchema>,
     ): CompiledMutation<CompiledQuery> | null {
+      const queryCompiler = getQueryCompiler(op.schema, op.namespace);
       switch (op.type) {
         case "create":
           // queryCompiler.create() calls encodeValues() which handles runtime defaults
           return {
             query: queryCompiler.create(op.table, op.values),
             expectedAffectedRows: null, // creates don't need affected row checks
+            expectedReturnedRows: null,
           };
 
         case "update": {
-          const table = toTable(op.table);
+          const table = toTable(op.schema, op.table);
           const idColumn = table.getIdColumn();
           const versionColumn = table.getVersionColumn();
 
@@ -221,12 +257,13 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
             ? {
                 query,
                 expectedAffectedRows: op.checkVersion ? 1 : null,
+                expectedReturnedRows: null,
               }
             : null;
         }
 
         case "delete": {
-          const table = toTable(op.table);
+          const table = toTable(op.schema, op.table);
           const idColumn = table.getIdColumn();
           const versionColumn = table.getVersionColumn();
 
@@ -254,9 +291,40 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
             ? {
                 query,
                 expectedAffectedRows: op.checkVersion ? 1 : null,
+                expectedReturnedRows: null,
               }
             : null;
         }
+
+        case "check": {
+          const table = toTable(op.schema, op.table);
+          const idColumn = table.getIdColumn();
+          const versionColumn = table.getVersionColumn();
+          const mapper = getMapperForOperation(op.namespace);
+          const tableName = mapper ? mapper.toPhysical(op.table) : op.table;
+
+          const externalId = op.id.externalId;
+          const version = op.id.version;
+
+          // Build a SELECT 1 query to check if the row exists with the correct version
+          const condition = buildCondition(table.columns, (eb) =>
+            eb.and(eb(idColumn.ormName, "=", externalId), eb(versionColumn.ormName, "=", version)),
+          );
+
+          let query = kysely.selectFrom(tableName).select(sql<number>`1`.as("exists"));
+
+          if (typeof condition === "boolean") {
+            throw new Error("Condition is a boolean, but should be a condition object.");
+          }
+
+          query = query.where((eb) => buildWhere(condition, eb, provider, mapper, table)).limit(1);
+
+          return {
+            query: query.compile(),
+            expectedAffectedRows: null,
+            expectedReturnedRows: 1, // Check that exactly 1 row was returned
+          };
+        }
       }
     },
   };