@fragno-dev/db 0.1.13 → 0.1.15

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

@@ -9,13 +9,18 @@ function getAffectedRows(result: QueryResult<unknown>): number {
     ("affectedRows" in result &&
     (typeof result["affectedRows"] === "number" || typeof result["affectedRows"] === "bigint")
       ? result["affectedRows"]
+      : undefined) ??
+    // SQLite via SQLocal returns `numUpdatedRows` as BigInt
+    ("numUpdatedRows" in result &&
+    (typeof result["numUpdatedRows"] === "number" || typeof result["numUpdatedRows"] === "bigint")
+      ? result["numUpdatedRows"]
       : undefined);
 
   if (affectedRows === undefined) {
-    throw new Error("No affected rows found");
+    throw new Error(`No affected rows found: ${JSON.stringify(result)}`);
   }
 
-  if (affectedRows > Number.MAX_SAFE_INTEGER) {
+  if (typeof affectedRows === "bigint" && affectedRows > Number.MAX_SAFE_INTEGER) {
     throw new Error(
       `affectedRows BigInt value ${affectedRows.toString()} exceeds JS safe integer range`,
     );
@@ -100,23 +105,24 @@ export async function executeKyselyMutationPhase(
       for (const compiledMutation of mutationBatch) {
         const result = await tx.executeQuery(compiledMutation.query);
 
-        // For creates (expectedAffectedRows === null), try to extract internal ID
+        // Best-effort extraction: Try to get internal ID if available
+        // This is optional - the system works without it by using subqueries for references
         if (compiledMutation.expectedAffectedRows === null) {
-          // Check if result has rows (RETURNING clause supported)
           if (Array.isArray(result.rows) && result.rows.length > 0) {
             const row = result.rows[0] as Record<string, unknown>;
             if ("_internalId" in row || "_internal_id" in row) {
               const internalId = (row["_internalId"] ?? row["_internal_id"]) as bigint;
               createdInternalIds.push(internalId);
             } else {
-              // RETURNING supported but _internalId not found
+              // RETURNING supported but _internalId not found - that's okay
               createdInternalIds.push(null);
             }
           } else {
-            // No RETURNING support (e.g., MySQL)
+            // No rows returned (no RETURNING clause, or SQLite via executeQuery)
+            // This is fine - references will use subqueries based on external IDs
             createdInternalIds.push(null);
           }
-        } else {
+        } else if (compiledMutation.expectedAffectedRows !== null) {
           // Check affected rows for updates/deletes
           const affectedRows = getAffectedRows(result);
 
@@ -128,6 +134,19 @@ export async function executeKyselyMutationPhase(
             );
           }
         }
+
+        if (compiledMutation.expectedReturnedRows !== null) {
+          // For SELECT queries (check operations), verify row count
+          const rowCount = Array.isArray(result.rows) ? result.rows.length : 0;
+
+          if (rowCount !== compiledMutation.expectedReturnedRows) {
+            // Version conflict detected - the SELECT didn't return the expected number of rows
+            // This means either the row doesn't exist or the version has changed
+            throw new Error(
+              `Version conflict: expected ${compiledMutation.expectedReturnedRows} rows returned, but got ${rowCount}`,
+            );
+          }
+        }
       }
     });
 

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

@@ -1,11 +1,7 @@
-import { Kysely, PostgresDialect } from "kysely";
-import { describe, it, beforeAll, assert, expect } from "vitest";
+import { describe, it, assert, expect } from "vitest";
 import { column, idColumn, referenceColumn, schema } from "../../schema/create";
-import type { Kysely as KyselyType, PostgresDialectConfig } from "kysely";
 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";
 
 describe("kysely-uow-joins", () => {
   const userSchema = schema((s) => {
@@ -88,33 +84,20 @@ describe("kysely-uow-joins", () => {
     );
   });
 
-  let kysely: KyselyType<any>; // eslint-disable-line @typescript-eslint/no-explicit-any
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let pool: ConnectionPool<Kysely<any>>;
-
-  beforeAll(async () => {
-    kysely = new Kysely({
-      dialect: new PostgresDialect({} as PostgresDialectConfig),
-    });
-
-    // Wrap in connection pool
-    pool = createKyselyConnectionPool(kysely);
-  });
-
   // Helper to create UnitOfWork for testing
   function createTestUOW(name?: string) {
-    const mockCompiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+    const mockCompiler = createKyselyUOWCompiler("postgresql");
     const mockExecutor = {
       executeRetrievalPhase: async () => [],
       executeMutationPhase: async () => ({ success: true, createdInternalIds: [] }),
     };
-    const mockDecoder: UOWDecoder<typeof userSchema> = (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;
     };
-    return new UnitOfWork(userSchema, mockCompiler, mockExecutor, mockDecoder, name);
+    return new UnitOfWork(mockCompiler, mockExecutor, mockDecoder, name).forSchema(userSchema);
   }
 
   describe("postgresql", () => {
@@ -127,7 +110,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author()),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -147,7 +130,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["name", "email"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -171,7 +154,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -191,7 +174,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.inviter((ib) => ib.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -211,7 +194,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.post((pb) => pb.select(["title"])).author((ab) => ab.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -231,7 +214,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.post((pb) => pb.select(["title"])).tag((tb) => tb.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -261,7 +244,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -281,7 +264,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["name"]).orderByIndex("idx_name", "asc"))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -302,7 +285,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["name"]).pageSize(1))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -330,7 +313,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -353,7 +336,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -376,7 +359,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -401,7 +384,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -423,7 +406,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -446,7 +429,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -466,7 +449,7 @@ describe("kysely-uow-joins", () => {
       const uow = createTestUOW();
       uow.find("posts", (b) => b.whereIndex("primary").join((jb) => jb.author()));
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -494,7 +477,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -517,7 +500,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -575,18 +558,18 @@ describe("kysely-uow-joins", () => {
     });
 
     function createCustomIdTestUOW() {
-      const mockCompiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const mockCompiler = createKyselyUOWCompiler("postgresql");
       const mockExecutor = {
         executeRetrievalPhase: async () => [],
         executeMutationPhase: async () => ({ success: true, createdInternalIds: [] }),
       };
-      const mockDecoder: UOWDecoder<typeof customIdSchema> = (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;
       };
-      return new UnitOfWork(customIdSchema, mockCompiler, mockExecutor, mockDecoder);
+      return new UnitOfWork(mockCompiler, mockExecutor, mockDecoder).forSchema(customIdSchema);
     }
 
     it("should compile join with custom id column names", () => {
@@ -602,7 +585,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -636,7 +619,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -655,7 +638,7 @@ describe("kysely-uow-joins", () => {
       const uow = createCustomIdTestUOW();
       uow.find("product_categories", (b) => b.whereIndex("primary").join((jb) => jb.product()));
 
-      const compiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -685,7 +668,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -717,7 +700,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -741,7 +724,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -765,7 +748,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.post((pb) => pb.select(["id"])).author((ab) => ab.select(["id"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -793,7 +776,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.inviter((ib) => ib.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler("postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);

package/src/adapters/kysely/migration/execute-base.ts

@@ -7,7 +7,7 @@ import type {
 import type { SQLProvider } from "../../../shared/providers";
 import { schemaToDBType } from "../../../schema/serialize";
 import type { TableNameMapper } from "../kysely-shared";
-import { SETTINGS_TABLE_NAME } from "../../../shared/settings-schema";
+import { SETTINGS_TABLE_NAME } from "../../../fragments/internal-fragment";
 
 export type ExecuteNode = {
   compile(): { sql: string; parameters: readonly unknown[] };