@fragno-dev/db 0.2.2 → 0.4.1

package/src/adapters/generic-sql/query/generic-sql-uow-operation-compiler.test.ts

@@ -1,11 +1,12 @@
 import { describe, test, expect } from "vitest";
-import { GenericSQLUOWOperationCompiler } from "./generic-sql-uow-operation-compiler";
-import { BetterSQLite3DriverConfig, NodePostgresDriverConfig } from "../driver-config";
-import { schema, column, idColumn, referenceColumn, FragnoId } from "../../../schema/create";
+
 import { Cursor } from "../../../query/cursor";
+import { schema, column, idColumn, referenceColumn, FragnoId } from "../../../schema/create";
+import { BetterSQLite3DriverConfig, NodePostgresDriverConfig } from "../driver-config";
+import { GenericSQLUOWOperationCompiler } from "./generic-sql-uow-operation-compiler";
 
 // Test schema with indexes
-const testSchema = schema((s) => {
+const testSchema = schema("test", (s) => {
   return s
     .addTable("users", (t) => {
       return t
@@ -17,8 +18,9 @@ const testSchema = schema((s) => {
         .addColumn("createdAt", column("timestamp"))
         .addColumn("invitedBy", referenceColumn().nullable())
         .createIndex("idx_email", ["email"], { unique: true })
-        .createIndex("idx_name", ["name"])
-        .createIndex("idx_age", ["age"]);
+        .createIndex("idx_users_name", ["name"])
+        .createIndex("idx_age", ["age"])
+        .createIndex("idx_users_name_created_id", ["name", "createdAt", "id"]);
     })
     .addTable("posts", (t) => {
       return t
@@ -37,21 +39,21 @@ const testSchema = schema((s) => {
         .addColumn("content", column("string"))
         .addColumn("postId", referenceColumn())
         .addColumn("authorId", referenceColumn())
-        .createIndex("idx_post", ["postId"])
+        .createIndex("idx_comments_post", ["postId"])
         .createIndex("idx_author", ["authorId"]);
     })
     .addTable("tags", (t) => {
       return t
         .addColumn("id", idColumn())
         .addColumn("name", column("string"))
-        .createIndex("idx_name", ["name"]);
+        .createIndex("idx_tags_name", ["name"]);
     })
     .addTable("post_tags", (t) => {
       return t
         .addColumn("id", idColumn())
         .addColumn("postId", referenceColumn())
         .addColumn("tagId", referenceColumn())
-        .createIndex("idx_post", ["postId"])
+        .createIndex("idx_post_tags_post", ["postId"])
         .createIndex("idx_tag", ["tagId"]);
     })
     .addReference("author", {
@@ -87,7 +89,7 @@ const testSchema = schema((s) => {
 });
 
 // Schema with custom-named id columns
-const customIdSchema = schema((s) => {
+const customIdSchema = schema("customid", (s) => {
   return s
     .addTable("products", (t) => {
       return t
@@ -133,6 +135,45 @@ const customIdSchema = schema((s) => {
     });
 });
 
+const joinOnlySchema = schema("joinonly", (s) => {
+  return s
+    .addTable("users", (t) => {
+      return t
+        .addColumn("id", idColumn())
+        .addColumn("email", column("string"))
+        .createIndex("idx_users_email", ["email"]);
+    })
+    .addTable("invitations", (t) => {
+      return t
+        .addColumn("id", idColumn())
+        .addColumn("email", column("string"))
+        .createIndex("idx_inv_email", ["email"]);
+    })
+    .addTable("memberships", (t) => {
+      return t
+        .addColumn("id", idColumn())
+        .addColumn("userId", referenceColumn())
+        .createIndex("idx_memberships_user", ["userId"]);
+    })
+    .addReference("invitedUser", {
+      type: "one",
+      from: { table: "invitations", column: "email" },
+      to: { table: "users", column: "email" },
+      foreignKey: false,
+    })
+    .addReference("membershipUser", {
+      type: "one",
+      from: { table: "memberships", column: "userId" },
+      to: { table: "users", column: "id" },
+    })
+    .addReference("memberships", {
+      type: "many",
+      from: { table: "users", column: "id" },
+      to: { table: "memberships", column: "userId" },
+      foreignKey: false,
+    });
+});
+
 describe("GenericSQLUOWOperationCompiler", () => {
   const driverConfig = new BetterSQLite3DriverConfig();
 
@@ -232,7 +273,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
 
     expect(result).not.toBeNull();
     expect(result!.query.sql).toMatchInlineSnapshot(
-      `"update "users" set "name" = ?, "_version" = COALESCE(_version, 0) + 1 where "users"."id" = ?"`,
+      `"update "users" set "name" = ?, "_version" = coalesce("_version", 0) + 1 where "users"."id" = ?"`,
     );
     expect(result!.expectedAffectedRows).toBeNull();
   });
@@ -253,7 +294,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
 
     expect(result).not.toBeNull();
     expect(result!.query.sql).toMatchInlineSnapshot(
-      `"update "users" set "name" = ?, "_version" = COALESCE(_version, 0) + 1 where ("users"."id" = ? and "users"."_version" = ?)"`,
+      `"update "users" set "name" = ?, "_version" = coalesce("_version", 0) + 1 where ("users"."id" = ? and "users"."_version" = ?)"`,
     );
     expect(result!.expectedAffectedRows).toBe(1n);
   });
@@ -396,7 +437,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
 
       expect(result).not.toBeNull();
       expect(result!.query.sql).toMatchInlineSnapshot(
-        `"update "posts" set "userId" = (select "_internalId" from "users" where "id" = ? limit ?), "_version" = COALESCE(_version, 0) + 1 where "posts"."id" = ?"`,
+        `"update "posts" set "userId" = (select "_internalId" from "users" where "id" = ? limit ?), "_version" = coalesce("_version", 0) + 1 where "posts"."id" = ?"`,
       );
     });
 
@@ -418,7 +459,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
       // Should not have nested SELECT for the userId value
       expect(result!.query.sql).not.toMatch(/\(select.*from.*users/i);
       expect(result!.query.sql).toMatchInlineSnapshot(
-        `"update "posts" set "userId" = ?, "_version" = COALESCE(_version, 0) + 1 where "posts"."id" = ?"`,
+        `"update "posts" set "userId" = ?, "_version" = coalesce("_version", 0) + 1 where "posts"."id" = ?"`,
       );
     });
 
@@ -440,7 +481,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
 
       expect(result).not.toBeNull();
       expect(result!.query.sql).toMatchInlineSnapshot(
-        `"update "users" set "name" = ?, "email" = ?, "isActive" = ?, "_version" = COALESCE(_version, 0) + 1 where "users"."id" = ?"`,
+        `"update "users" set "name" = ?, "email" = ?, "isActive" = ?, "_version" = coalesce("_version", 0) + 1 where "users"."id" = ?"`,
       );
     });
   });
@@ -612,7 +653,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
 
       expect(result).not.toBeNull();
       expect(result!.query.sql).toMatchInlineSnapshot(
-        `"update "products" set "price" = ?, "_version" = COALESCE(_version, 0) + 1 where "products"."productId" = ?"`,
+        `"update "products" set "price" = ?, "_version" = coalesce("_version", 0) + 1 where "products"."productId" = ?"`,
       );
     });
 
@@ -757,11 +798,11 @@ describe("GenericSQLUOWOperationCompiler", () => {
         type: "find",
         schema: testSchema,
         table: testSchema.tables.users,
-        indexName: "idx_name",
+        indexName: "idx_users_name",
         options: {
-          useIndex: "idx_name",
+          useIndex: "idx_users_name",
           select: true,
-          orderByIndex: { indexName: "idx_name", direction: "asc" },
+          orderByIndex: { indexName: "idx_users_name", direction: "asc" },
         },
       });
 
@@ -799,7 +840,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
     test("should compile find with cursor pagination using after", () => {
       const compiler = new GenericSQLUOWOperationCompiler(driverConfig);
       const cursor = new Cursor({
-        indexName: "idx_name",
+        indexName: "idx_users_name",
         orderDirection: "asc",
         pageSize: 10,
         indexValues: { name: "Alice" },
@@ -809,11 +850,11 @@ describe("GenericSQLUOWOperationCompiler", () => {
         type: "find",
         schema: testSchema,
         table: testSchema.tables.users,
-        indexName: "idx_name",
+        indexName: "idx_users_name",
         options: {
-          useIndex: "idx_name",
+          useIndex: "idx_users_name",
           select: true,
-          orderByIndex: { indexName: "idx_name", direction: "asc" },
+          orderByIndex: { indexName: "idx_users_name", direction: "asc" },
           after: cursor,
           pageSize: 10,
         },
@@ -829,7 +870,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
     test("should compile find with cursor pagination using before", () => {
       const compiler = new GenericSQLUOWOperationCompiler(driverConfig);
       const cursor = new Cursor({
-        indexName: "idx_name",
+        indexName: "idx_users_name",
         orderDirection: "desc",
         pageSize: 10,
         indexValues: { name: "Bob" },
@@ -839,11 +880,11 @@ describe("GenericSQLUOWOperationCompiler", () => {
         type: "find",
         schema: testSchema,
         table: testSchema.tables.users,
-        indexName: "idx_name",
+        indexName: "idx_users_name",
         options: {
-          useIndex: "idx_name",
+          useIndex: "idx_users_name",
           select: true,
-          orderByIndex: { indexName: "idx_name", direction: "desc" },
+          orderByIndex: { indexName: "idx_users_name", direction: "desc" },
           before: cursor,
           pageSize: 10,
         },
@@ -859,7 +900,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
     test("should compile find with cursor pagination and additional where conditions", () => {
       const compiler = new GenericSQLUOWOperationCompiler(driverConfig);
       const cursor = new Cursor({
-        indexName: "idx_name",
+        indexName: "idx_users_name",
         orderDirection: "asc",
         pageSize: 5,
         indexValues: { name: "Alice" },
@@ -869,12 +910,12 @@ describe("GenericSQLUOWOperationCompiler", () => {
         type: "find",
         schema: testSchema,
         table: testSchema.tables.users,
-        indexName: "idx_name",
+        indexName: "idx_users_name",
         options: {
-          useIndex: "idx_name",
+          useIndex: "idx_users_name",
           select: true,
           where: (eb) => eb("isActive", "=", true),
-          orderByIndex: { indexName: "idx_name", direction: "asc" },
+          orderByIndex: { indexName: "idx_users_name", direction: "asc" },
           after: cursor,
           pageSize: 5,
         },
@@ -886,6 +927,45 @@ describe("GenericSQLUOWOperationCompiler", () => {
       );
       expect(result!.parameters).toEqual([1, "Alice", 5]);
     });
+
+    test("should compile find with composite cursor pagination", () => {
+      const compiler = new GenericSQLUOWOperationCompiler(driverConfig);
+      const createdAt = new Date("2024-01-01T00:00:00.000Z");
+      const cursor = new Cursor({
+        indexName: "idx_users_name_created_id",
+        orderDirection: "desc",
+        pageSize: 7,
+        indexValues: { name: "Alice", createdAt, id: "user-123" },
+      });
+
+      const result = compiler.compileFind({
+        type: "find",
+        schema: testSchema,
+        table: testSchema.tables.users,
+        indexName: "idx_users_name_created_id",
+        options: {
+          useIndex: "idx_users_name_created_id",
+          select: true,
+          orderByIndex: { indexName: "idx_users_name_created_id", direction: "desc" },
+          after: cursor,
+          pageSize: 7,
+        },
+      });
+
+      expect(result).not.toBeNull();
+      expect(result!.sql).toMatchInlineSnapshot(
+        `"select "users"."id" as "id", "users"."name" as "name", "users"."email" as "email", "users"."age" as "age", "users"."isActive" as "isActive", "users"."createdAt" as "createdAt", "users"."invitedBy" as "invitedBy", "users"."_internalId" as "_internalId", "users"."_version" as "_version" from "users" where ("users"."name" < ? or ("users"."name" = ? and "users"."createdAt" < ?) or ("users"."name" = ? and "users"."createdAt" = ? and "users"."id" < ?)) order by "users"."name" desc, "users"."createdAt" desc, "users"."id" desc limit ?"`,
+      );
+      expect(result!.parameters).toEqual([
+        "Alice",
+        "Alice",
+        createdAt.getTime(),
+        "Alice",
+        createdAt.getTime(),
+        "user-123",
+        7,
+      ]);
+    });
   });
 
   describe("complex where conditions", () => {
@@ -1099,6 +1179,62 @@ describe("GenericSQLUOWOperationCompiler", () => {
       );
     });
 
+    test("should compile join-only relation without internal id coercion", () => {
+      const compiler = new GenericSQLUOWOperationCompiler(driverConfig);
+
+      const result = compiler.compileFind({
+        type: "find",
+        schema: joinOnlySchema,
+        table: joinOnlySchema.tables.invitations,
+        indexName: "primary",
+        options: {
+          useIndex: "primary",
+          select: ["id"],
+          joins: [
+            {
+              relation: joinOnlySchema.tables.invitations.relations.invitedUser,
+              options: {
+                select: ["email"],
+              },
+            },
+          ],
+        },
+      });
+
+      expect(result).not.toBeNull();
+      expect(result!.sql).toMatchInlineSnapshot(
+        `"select "invitedUser"."email" as "invitedUser:email", "invitedUser"."_internalId" as "invitedUser:_internalId", "invitedUser"."_version" as "invitedUser:_version", "invitations"."id" as "id", "invitations"."_internalId" as "_internalId", "invitations"."_version" as "_version" from "invitations" left join "users" as "invitedUser" on "invitations"."email" = "invitedUser"."email""`,
+      );
+    });
+
+    test("should coerce left-side id for join-only relations", () => {
+      const compiler = new GenericSQLUOWOperationCompiler(driverConfig);
+
+      const result = compiler.compileFind({
+        type: "find",
+        schema: joinOnlySchema,
+        table: joinOnlySchema.tables.users,
+        indexName: "primary",
+        options: {
+          useIndex: "primary",
+          select: ["id"],
+          joins: [
+            {
+              relation: joinOnlySchema.tables.users.relations.memberships,
+              options: {
+                select: ["id"],
+              },
+            },
+          ],
+        },
+      });
+
+      expect(result).not.toBeNull();
+      expect(result!.sql).toMatchInlineSnapshot(
+        `"select "memberships"."id" as "memberships:id", "memberships"."_internalId" as "memberships:_internalId", "memberships"."_version" as "memberships:_version", "users"."id" as "id", "users"."_internalId" as "_internalId", "users"."_version" as "_version" from "users" left join "memberships" as "memberships" on "users"."_internalId" = "memberships"."userId""`,
+      );
+    });
+
     test("should compile join with specific column selection", () => {
       const compiler = new GenericSQLUOWOperationCompiler(driverConfig);
 
@@ -1220,7 +1356,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
 
       expect(result).not.toBeNull();
       expect(result!.sql).toMatchInlineSnapshot(
-        `"select "author"."name" as "author:name", "author"."_internalId" as "author:_internalId", "author"."_version" as "author:_version", "posts"."id" as "id", "posts"."title" as "title", "posts"."_internalId" as "_internalId", "posts"."_version" as "_version" from "posts" left join "users" as "author" on ("posts"."userId" = "author"."_internalId" and "users"."name" like ?)"`,
+        `"select "author"."name" as "author:name", "author"."_internalId" as "author:_internalId", "author"."_version" as "author:_version", "posts"."id" as "id", "posts"."title" as "title", "posts"."_internalId" as "_internalId", "posts"."_version" as "_version" from "posts" left join "users" as "author" on ("posts"."userId" = "author"."_internalId" and "author"."name" like ?)"`,
       );
       expect(result!.parameters).toEqual(["%john%"]);
     });
@@ -1267,7 +1403,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
 
       expect(result).not.toBeNull();
       expect(result!.sql).toMatchInlineSnapshot(
-        `"select "author"."name" as "author:name", "author"."_internalId" as "author:_internalId", "author"."_version" as "author:_version", "posts"."id" as "id", "posts"."title" as "title", "posts"."_internalId" as "_internalId", "posts"."_version" as "_version" from "posts" left join "users" as "author" on ("posts"."userId" = "author"."_internalId" and ("users"."name" like ? and "users"."isActive" = ?))"`,
+        `"select "author"."name" as "author:name", "author"."_internalId" as "author:_internalId", "author"."_version" as "author:_version", "posts"."id" as "id", "posts"."title" as "title", "posts"."_internalId" as "_internalId", "posts"."_version" as "_version" from "posts" left join "users" as "author" on ("posts"."userId" = "author"."_internalId" and ("author"."name" like ? and "author"."isActive" = ?))"`,
       );
     });
 
@@ -1358,7 +1494,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
 
       expect(result).not.toBeNull();
       expect(result!.sql).toMatchInlineSnapshot(
-        `"select "author"."id" as "author:id", "author"."name" as "author:name", "author"."_internalId" as "author:_internalId", "author"."_version" as "author:_version", "posts"."id" as "id", "posts"."title" as "title", "posts"."_internalId" as "_internalId", "posts"."_version" as "_version" from "posts" left join "users" as "author" on ("posts"."userId" = "author"."_internalId" and "users"."id" = ?)"`,
+        `"select "author"."id" as "author:id", "author"."name" as "author:name", "author"."_internalId" as "author:_internalId", "author"."_version" as "author:_version", "posts"."id" as "id", "posts"."title" as "title", "posts"."_internalId" as "_internalId", "posts"."_version" as "_version" from "posts" left join "users" as "author" on ("posts"."userId" = "author"."_internalId" and "author"."id" = ?)"`,
       );
       expect(result!.parameters).toEqual(["user-123"]);
     });
@@ -1498,7 +1634,7 @@ describe("GenericSQLUOWOperationCompiler", () => {
 
       expect(result).not.toBeNull();
       expect(result!.sql).toMatchInlineSnapshot(
-        `"select "product"."productId" as "product:productId", "product"."name" as "product:name", "product"."_internalId" as "product:_internalId", "product"."_version" as "product:_version", "product_categories"."id" as "id", "product_categories"."_internalId" as "_internalId", "product_categories"."_version" as "_version" from "product_categories" left join "products" as "product" on ("product_categories"."prodRef" = "product"."_internalId" and "products"."productId" = ?)"`,
+        `"select "product"."productId" as "product:productId", "product"."name" as "product:name", "product"."_internalId" as "product:_internalId", "product"."_version" as "product:_version", "product_categories"."id" as "id", "product_categories"."_internalId" as "_internalId", "product_categories"."_version" as "_version" from "product_categories" left join "products" as "product" on ("product_categories"."prodRef" = "product"."_internalId" and "product"."productId" = ?)"`,
       );
       expect(result!.parameters).toEqual(["prod-456"]);
     });

package/src/adapters/generic-sql/query/generic-sql-uow-operation-compiler.ts

@@ -1,21 +1,23 @@
-import { UOWOperationCompiler } from "../../shared/uow-operation-compiler";
 import type { CompiledQuery } from "kysely";
-import type { DriverConfig } from "../driver-config";
-import type { TableNameMapper } from "../../shared/table-name-mapper";
+
+import type { NamingResolver } from "../../../naming/sql-naming";
+import { buildCondition } from "../../../query/condition-builder";
+import type { Condition } from "../../../query/condition-builder";
+import { buildFindOptions } from "../../../query/orm/orm";
+import type { AnySelectClause } from "../../../query/simple-query-interface";
 import type {
   RetrievalOperation,
   MutationOperation,
   CompiledMutation,
 } from "../../../query/unit-of-work/unit-of-work";
 import type { AnyColumn, AnySchema } from "../../../schema/create";
-import { buildCondition } from "../../../query/condition-builder";
+import { UOWOperationCompiler } from "../../shared/uow-operation-compiler";
+import type { DriverConfig } from "../driver-config";
+import { createColdKysely } from "../migration/cold-kysely";
+import type { SQLiteStorageMode } from "../sqlite-storage";
 import { createSQLQueryCompiler } from "./create-sql-query-compiler";
-import { SQLQueryCompiler } from "./sql-query-compiler";
 import { buildCursorCondition } from "./cursor-utils";
-import type { Condition } from "../../../query/condition-builder";
-import { buildFindOptions } from "../../../query/orm/orm";
-import type { AnySelectClause } from "../../../query/simple-query-interface";
-import { createColdKysely } from "../migration/cold-kysely";
+import { SQLQueryCompiler } from "./sql-query-compiler";
 
 /**
  * Generic SQL UOW Operation Compiler.
@@ -24,26 +26,40 @@ import { createColdKysely } from "../migration/cold-kysely";
  * high-level business logic like cursor pagination, version checking, and index resolution.
  */
 export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<CompiledQuery> {
+  private readonly sqliteStorageMode?: SQLiteStorageMode;
+
   constructor(
     driverConfig: DriverConfig,
-    mapperFactory?: (namespace: string | undefined) => TableNameMapper | undefined,
+    sqliteStorageMode?: SQLiteStorageMode,
+    resolverFactory?: (schema: AnySchema, namespace: string | null) => NamingResolver,
   ) {
-    super(driverConfig, mapperFactory);
+    super(driverConfig, resolverFactory);
+    this.sqliteStorageMode = sqliteStorageMode;
   }
 
   /**
    * Get SQL compiler for a specific namespace
    */
-  private getSQLCompiler(namespace: string | undefined): SQLQueryCompiler {
-    const mapper = this.getMapperForOperation(namespace);
+  private getSQLCompiler(
+    schema: AnySchema,
+    namespace: string | null | undefined,
+  ): SQLQueryCompiler {
+    const resolver = this.getNamingResolver(schema, namespace ?? null);
     const kysely = createColdKysely(this.driverConfig.databaseType);
-    return createSQLQueryCompiler(kysely, this.driverConfig, mapper);
+    const schemaName = resolver.getSchemaName();
+    const scopedKysely = schemaName ? kysely.withSchema(schemaName) : kysely;
+    return createSQLQueryCompiler(
+      scopedKysely,
+      this.driverConfig,
+      this.sqliteStorageMode,
+      resolver,
+    );
   }
 
   override compileCount(
     op: RetrievalOperation<AnySchema> & { type: "count" },
   ): CompiledQuery | null {
-    const sqlCompiler = this.getSQLCompiler(op.namespace);
+    const sqlCompiler = this.getSQLCompiler(op.schema, op.namespace);
 
     // Build where condition
     let conditions = op.options.where
@@ -61,7 +77,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
   }
 
   override compileFind(op: RetrievalOperation<AnySchema> & { type: "find" }): CompiledQuery | null {
-    const sqlCompiler = this.getSQLCompiler(op.namespace);
+    const sqlCompiler = this.getSQLCompiler(op.schema, op.namespace);
 
     // Extract options
     const {
@@ -103,19 +119,14 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
       orderBy = indexColumns.map((col) => [col, orderDirection]);
     }
 
-    // Handle cursor pagination - build a cursor condition
-    // TODO: Multi-column cursor pagination not yet supported
-    if ((after || before) && indexColumns.length > 1) {
-      throw new Error(
-        "Multi-column cursor pagination is not yet supported in Generic SQL implementation",
-      );
-    }
+    // Handle cursor pagination - build a cursor condition (supports multi-column lexicographic compare)
     const cursorCondition = buildCursorCondition(
       after || before,
       indexColumns,
       orderDirection,
       !!after,
       this.driverConfig,
+      this.sqliteStorageMode,
     );
 
     // Combine user where clause with cursor condition
@@ -153,6 +164,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
         orderBy,
         limit: effectiveLimit,
         join,
+        readTracking: op.readTracking,
       });
     }
 
@@ -160,7 +172,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
     const compiledOptions = buildFindOptions(op.table, {
       ...findManyOptions,
       where: combinedWhere ? () => combinedWhere! : undefined,
-      orderBy: orderBy?.map(([col, dir]) => [col.ormName, dir]),
+      orderBy: orderBy?.map(([col, dir]) => [col.name, dir]),
       limit: effectiveLimit,
     });
 
@@ -168,17 +180,21 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
       return null;
     }
 
-    return sqlCompiler.compileFindMany(op.table, compiledOptions);
+    return sqlCompiler.compileFindMany(op.table, {
+      ...compiledOptions,
+      readTracking: op.readTracking,
+    });
   }
 
   override compileCreate(
     op: MutationOperation<AnySchema> & { type: "create" },
   ): CompiledMutation<CompiledQuery> | null {
-    const sqlCompiler = this.getSQLCompiler(op.namespace);
+    const sqlCompiler = this.getSQLCompiler(op.schema, op.namespace);
     const table = this.getTable(op.schema, op.table);
 
     return {
       query: sqlCompiler.compileCreate(table, op.values),
+      operation: op,
       op: "create",
       expectedAffectedRows: null, // creates don't need affected row checks
       expectedReturnedRows: null,
@@ -188,7 +204,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
   override compileUpdate(
     op: MutationOperation<AnySchema> & { type: "update" },
   ): CompiledMutation<CompiledQuery> | null {
-    const sqlCompiler = this.getSQLCompiler(op.namespace);
+    const sqlCompiler = this.getSQLCompiler(op.schema, op.namespace);
     const table = this.getTable(op.schema, op.table);
     const idColumn = table.getIdColumn();
     const versionColumn = table.getVersionColumn();
@@ -200,12 +216,9 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
     const conditionsResult =
       versionToCheck !== undefined
         ? buildCondition(table.columns, (eb) =>
-            eb.and(
-              eb(idColumn.ormName, "=", externalId),
-              eb(versionColumn.ormName, "=", versionToCheck),
-            ),
+            eb.and(eb(idColumn.name, "=", externalId), eb(versionColumn.name, "=", versionToCheck)),
           )
-        : buildCondition(table.columns, (eb) => eb(idColumn.ormName, "=", externalId));
+        : buildCondition(table.columns, (eb) => eb(idColumn.name, "=", externalId));
 
     if (conditionsResult === false) {
       return null;
@@ -229,6 +242,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
 
     return {
       query,
+      operation: op,
       op: "update",
       expectedAffectedRows: useReturningForCheck ? null : op.checkVersion ? 1n : null,
       expectedReturnedRows: useReturningForCheck ? 1 : null,
@@ -238,7 +252,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
   override compileDelete(
     op: MutationOperation<AnySchema> & { type: "delete" },
   ): CompiledMutation<CompiledQuery> | null {
-    const sqlCompiler = this.getSQLCompiler(op.namespace);
+    const sqlCompiler = this.getSQLCompiler(op.schema, op.namespace);
     const table = this.getTable(op.schema, op.table);
     const idColumn = table.getIdColumn();
     const versionColumn = table.getVersionColumn();
@@ -250,12 +264,9 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
     const conditionsResult =
       versionToCheck !== undefined
         ? buildCondition(table.columns, (eb) =>
-            eb.and(
-              eb(idColumn.ormName, "=", externalId),
-              eb(versionColumn.ormName, "=", versionToCheck),
-            ),
+            eb.and(eb(idColumn.name, "=", externalId), eb(versionColumn.name, "=", versionToCheck)),
           )
-        : buildCondition(table.columns, (eb) => eb(idColumn.ormName, "=", externalId));
+        : buildCondition(table.columns, (eb) => eb(idColumn.name, "=", externalId));
 
     if (conditionsResult === false) {
       return null;
@@ -278,6 +289,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
 
     return {
       query,
+      operation: op,
       op: "delete",
       expectedAffectedRows: useReturningForCheck ? null : op.checkVersion ? 1n : null,
       expectedReturnedRows: useReturningForCheck ? 1 : null,
@@ -287,7 +299,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
   override compileCheck(
     op: MutationOperation<AnySchema> & { type: "check" },
   ): CompiledMutation<CompiledQuery> {
-    const sqlCompiler = this.getSQLCompiler(op.namespace);
+    const sqlCompiler = this.getSQLCompiler(op.schema, op.namespace);
     const table = this.getTable(op.schema, op.table);
     const idColumn = table.getIdColumn();
     const versionColumn = table.getVersionColumn();
@@ -297,7 +309,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
 
     // 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)),
+      eb.and(eb(idColumn.name, "=", externalId), eb(versionColumn.name, "=", version)),
     );
 
     if (typeof condition === "boolean") {
@@ -306,6 +318,7 @@ export class GenericSQLUOWOperationCompiler extends UOWOperationCompiler<Compile
 
     return {
       query: sqlCompiler.compileCheck(table, condition),
+      operation: op,
       op: "check",
       expectedAffectedRows: null,
       expectedReturnedRows: 1, // Check that exactly 1 row was returned