@fragno-dev/db 0.1.6 → 0.1.7

package/src/adapters/drizzle/drizzle-query.ts

@@ -1,12 +1,12 @@
 import type { AbstractQuery } from "../../query/query";
 import type { AnySchema } from "../../schema/create";
-import type { DrizzleConfig } from "./drizzle-adapter";
 import type { CompiledMutation, UOWExecutor } from "../../query/unit-of-work";
 import { createDrizzleUOWCompiler, type DrizzleCompiledQuery } from "./drizzle-uow-compiler";
 import { executeDrizzleRetrievalPhase, executeDrizzleMutationPhase } from "./drizzle-uow-executor";
 import { UnitOfWork } from "../../query/unit-of-work";
-import { parseDrizzle, type DrizzleResult, type TableNameMapper } from "./shared";
+import { parseDrizzle, type DrizzleResult, type TableNameMapper, type DBType } from "./shared";
 import { createDrizzleUOWDecoder } from "./drizzle-uow-decoder";
+import type { ConnectionPool } from "../../shared/connection-pool";
 
 /**
  * Configuration options for creating a Drizzle Unit of Work
@@ -27,36 +27,53 @@ export interface DrizzleUOWConfig {
  * enabling features like SQL snapshot testing.
  *
  * @param schema - The database schema definition
- * @param config - Drizzle configuration containing the database instance and provider
+ * @param pool - Connection pool for acquiring database connections
+ * @param provider - SQL provider (sqlite, mysql, postgresql)
  * @param mapper - Optional table name mapper for namespace prefixing
  * @returns An AbstractQuery instance for performing database operations
  *
  * @example
  * ```ts
- * const queryEngine = fromDrizzle(mySchema, {
- *   db: drizzle,
- *   provider: 'postgresql'
- * });
+ * const pool = createSimpleConnectionPool(drizzle);
+ * const queryEngine = fromDrizzle(mySchema, pool, 'postgresql');
  *
  * const uow = queryEngine.createUnitOfWork('myOperation');
  * ```
  */
 export function fromDrizzle<T extends AnySchema>(
   schema: T,
-  config: DrizzleConfig,
+  pool: ConnectionPool<DBType>,
+  provider: "sqlite" | "mysql" | "postgresql",
   mapper?: TableNameMapper,
 ): AbstractQuery<T, DrizzleUOWConfig> {
-  const [db] = parseDrizzle(config.db);
-  const { provider } = config;
-
   function createUOW(name?: string, uowConfig?: DrizzleUOWConfig) {
-    const uowCompiler = createDrizzleUOWCompiler(schema, config, mapper, uowConfig?.onQuery);
+    const uowCompiler = createDrizzleUOWCompiler(
+      schema,
+      pool,
+      provider,
+      mapper,
+      uowConfig?.onQuery,
+    );
 
     const executor: UOWExecutor<DrizzleCompiledQuery, DrizzleResult> = {
-      executeRetrievalPhase: (retrievalBatch: DrizzleCompiledQuery[]) =>
-        executeDrizzleRetrievalPhase(db, retrievalBatch, provider),
-      executeMutationPhase: (mutationBatch: CompiledMutation<DrizzleCompiledQuery>[]) =>
-        executeDrizzleMutationPhase(db, mutationBatch, provider),
+      async executeRetrievalPhase(retrievalBatch: DrizzleCompiledQuery[]) {
+        const conn = await pool.connect();
+        try {
+          const db = parseDrizzle(conn.db)[0];
+          return await executeDrizzleRetrievalPhase(db, retrievalBatch, provider);
+        } finally {
+          await conn.release();
+        }
+      },
+      async executeMutationPhase(mutationBatch: CompiledMutation<DrizzleCompiledQuery>[]) {
+        const conn = await pool.connect();
+        try {
+          const db = parseDrizzle(conn.db)[0];
+          return await executeDrizzleMutationPhase(db, mutationBatch, provider);
+        } finally {
+          await conn.release();
+        }
+      },
     };
 
     const decoder = createDrizzleUOWDecoder(schema, provider);

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

@@ -8,11 +8,12 @@ import {
   type AnySchema,
 } from "../../schema/create";
 import { createDrizzleUOWCompiler } from "./drizzle-uow-compiler";
-import type { DrizzleConfig } from "./drizzle-adapter";
 import { drizzle } from "drizzle-orm/pglite";
 import type { DBType } from "./shared";
 import { UnitOfWork, type UOWDecoder } from "../../query/unit-of-work";
 import { writeAndLoadSchema } from "./test-utils";
+import type { ConnectionPool } from "../../shared/connection-pool";
+import { createDrizzleConnectionPool } from "./drizzle-connection-pool";
 
 /**
  * Integration tests for Drizzle UOW compiler and executor.
@@ -48,7 +49,7 @@ describe("drizzle-uow-compiler", () => {
   });
 
   let db: DBType;
-  let config: DrizzleConfig;
+  let pool: ConnectionPool<DBType>;
 
   beforeAll(async () => {
     // Write schema to file and dynamically import it
@@ -63,10 +64,8 @@ describe("drizzle-uow-compiler", () => {
       schema: schemaModule,
     }) as unknown as DBType;
 
-    config = {
-      db,
-      provider: "postgresql",
-    };
+    // Wrap in connection pool
+    pool = createDrizzleConnectionPool(db);
 
     return async () => {
       await cleanup();
@@ -74,7 +73,7 @@ describe("drizzle-uow-compiler", () => {
   });
 
   function createTestUOWWithSchema<const T extends AnySchema>(schema: T) {
-    const compiler = createDrizzleUOWCompiler(schema, config);
+    const compiler = createDrizzleUOWCompiler(schema, pool, "postgresql");
     const mockExecutor = {
       executeRetrievalPhase: async () => [],
       executeMutationPhase: async () => ({ success: true, createdInternalIds: [] }),
@@ -89,7 +88,7 @@ describe("drizzle-uow-compiler", () => {
   }
 
   function createTestUOW(name?: string) {
-    const compiler = createDrizzleUOWCompiler(testSchema, config);
+    const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
     const mockExecutor = {
       executeRetrievalPhase: async () => [],
       executeMutationPhase: async () => ({ success: true, createdInternalIds: [] }),
@@ -104,7 +103,7 @@ describe("drizzle-uow-compiler", () => {
   }
 
   it("should create a compiler with the correct structure", () => {
-    const compiler = createDrizzleUOWCompiler(testSchema, config);
+    const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
 
     expect(compiler).toBeDefined();
     expect(compiler.compileRetrievalOperation).toBeInstanceOf(Function);
@@ -118,7 +117,7 @@ describe("drizzle-uow-compiler", () => {
         b.whereIndex("idx_email", (eb) => eb("email", "=", "test@example.com")),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -134,7 +133,7 @@ describe("drizzle-uow-compiler", () => {
         b.whereIndex("idx_name", (eb) => eb("name", "=", "Alice")).select(["id", "name"]),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -148,7 +147,7 @@ describe("drizzle-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary").pageSize(10));
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -162,7 +161,7 @@ describe("drizzle-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary").orderByIndex("primary", "desc"));
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -175,7 +174,7 @@ describe("drizzle-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("idx_name").orderByIndex("idx_name", "desc"));
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -191,7 +190,7 @@ describe("drizzle-uow-compiler", () => {
       );
       uow.find("posts", (b) => b.whereIndex("idx_title", (eb) => eb("title", "contains", "test")));
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(2);
@@ -207,7 +206,7 @@ describe("drizzle-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary").selectCount());
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -222,7 +221,7 @@ describe("drizzle-uow-compiler", () => {
         b.whereIndex("idx_name", (eb) => eb("name", "starts with", "John")).selectCount(),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -239,7 +238,7 @@ describe("drizzle-uow-compiler", () => {
         b.whereIndex("idx_name").orderByIndex("idx_name", "asc").after(cursor).pageSize(10),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -256,7 +255,7 @@ describe("drizzle-uow-compiler", () => {
         b.whereIndex("idx_name").orderByIndex("idx_name", "desc").before(cursor).pageSize(10),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -277,7 +276,7 @@ describe("drizzle-uow-compiler", () => {
           .pageSize(5),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -295,7 +294,7 @@ describe("drizzle-uow-compiler", () => {
           .join((jb) => jb.author()),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -318,7 +317,7 @@ describe("drizzle-uow-compiler", () => {
           ),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -336,7 +335,7 @@ describe("drizzle-uow-compiler", () => {
           .join((jb) => jb.author((builder) => builder.orderByIndex("idx_name", "desc"))),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -352,7 +351,7 @@ describe("drizzle-uow-compiler", () => {
         b.whereIndex("primary").join((jb) => jb.author((builder) => builder.pageSize(5))),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -373,7 +372,7 @@ describe("drizzle-uow-compiler", () => {
         age: 30,
       });
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -399,7 +398,7 @@ describe("drizzle-uow-compiler", () => {
         }),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -415,7 +414,7 @@ describe("drizzle-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 5);
       uow.update("users", userId, (b) => b.set({ age: 18 }).check());
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -431,7 +430,7 @@ describe("drizzle-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 0);
       uow.delete("users", userId);
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -447,7 +446,7 @@ describe("drizzle-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 3);
       uow.delete("users", userId, (b) => b.check());
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -467,7 +466,7 @@ describe("drizzle-uow-compiler", () => {
         }),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -482,7 +481,7 @@ describe("drizzle-uow-compiler", () => {
       const uow = createTestUOW();
       uow.delete("users", "user123");
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -522,7 +521,7 @@ describe("drizzle-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user456", 0);
       uow.delete("posts", userId);
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [createBatch, updateBatch, deleteBatch] = compiled.mutationBatch;
 
@@ -561,7 +560,7 @@ describe("drizzle-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 3);
       uow.update("users", userId, (b) => b.set({ age: 31 }).check());
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.name).toBe("update-user-balance");
@@ -593,7 +592,7 @@ describe("drizzle-uow-compiler", () => {
         ),
       );
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -607,7 +606,7 @@ describe("drizzle-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary", () => false));
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       // When condition is false, the operation should return null and not be added to batch
@@ -618,7 +617,7 @@ describe("drizzle-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary", () => true));
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -635,7 +634,7 @@ describe("drizzle-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 5);
       uow.update("users", userId, (b) => b.set({ age: 31 }).check());
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -652,7 +651,7 @@ describe("drizzle-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user456", 3);
       uow.delete("users", userId, (b) => b.check());
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -672,7 +671,7 @@ describe("drizzle-uow-compiler", () => {
       uow.update("users", userId, (b) => b.set({ age: 30 }).check());
       uow.update("posts", postId, (b) => b.set({ viewCount: 100 }).check());
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [userBatch, postBatch] = compiled.mutationBatch;
 
@@ -699,7 +698,7 @@ describe("drizzle-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user1", 0);
       uow.update("users", userId, (b) => b.set({ age: 25 }));
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -715,7 +714,7 @@ describe("drizzle-uow-compiler", () => {
     it("should handle UOW with no operations", () => {
       const uow = createTestUOW();
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(0);
@@ -726,7 +725,7 @@ describe("drizzle-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users");
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -740,7 +739,7 @@ describe("drizzle-uow-compiler", () => {
         email: "test@example.com",
       });
 
-      const compiler = createDrizzleUOWCompiler(testSchema, config);
+      const compiler = createDrizzleUOWCompiler(testSchema, pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(0);
@@ -770,7 +769,7 @@ describe("drizzle-uow-compiler", () => {
     });
 
     let defaultsDb: DBType;
-    let defaultsConfig: DrizzleConfig;
+    let defaultsPool: ConnectionPool<DBType>;
 
     beforeAll(async () => {
       // Write schema to file and dynamically import it
@@ -785,10 +784,8 @@ describe("drizzle-uow-compiler", () => {
         schema: schemaModule,
       }) as unknown as DBType;
 
-      defaultsConfig = {
-        db: defaultsDb,
-        provider: "postgresql",
-      };
+      // Wrap in connection pool
+      defaultsPool = createDrizzleConnectionPool(defaultsDb);
 
       return async () => {
         await cleanup();
@@ -802,7 +799,7 @@ describe("drizzle-uow-compiler", () => {
         message: "Test log",
       });
 
-      const compiler = createDrizzleUOWCompiler(defaultsSchema, defaultsConfig);
+      const compiler = createDrizzleUOWCompiler(defaultsSchema, defaultsPool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -832,7 +829,7 @@ describe("drizzle-uow-compiler", () => {
         status: "active",
       });
 
-      const compiler = createDrizzleUOWCompiler(defaultsSchema, defaultsConfig);
+      const compiler = createDrizzleUOWCompiler(defaultsSchema, defaultsPool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -854,7 +851,7 @@ describe("drizzle-uow-compiler", () => {
         counter: 999, // override the function default
       });
 
-      const compiler = createDrizzleUOWCompiler(defaultsSchema, defaultsConfig);
+      const compiler = createDrizzleUOWCompiler(defaultsSchema, defaultsPool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -875,7 +872,7 @@ describe("drizzle-uow-compiler", () => {
       uow.create("logs", { message: "Log 2" });
       uow.create("logs", { message: "Log 3" });
 
-      const compiler = createDrizzleUOWCompiler(defaultsSchema, defaultsConfig);
+      const compiler = createDrizzleUOWCompiler(defaultsSchema, defaultsPool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.mutationBatch).toHaveLength(3);
@@ -930,7 +927,7 @@ describe("drizzle-uow-compiler", () => {
     });
 
     let nestedDb: DBType;
-    let nestedConfig: DrizzleConfig;
+    let nestedPool: ConnectionPool<DBType>;
 
     beforeAll(async () => {
       // Write schema to file and dynamically import it
@@ -945,10 +942,8 @@ describe("drizzle-uow-compiler", () => {
         schema: schemaModule,
       }) as unknown as DBType;
 
-      nestedConfig = {
-        db: nestedDb,
-        provider: "postgresql",
-      };
+      // Wrap in connection pool
+      nestedPool = createDrizzleConnectionPool(nestedDb);
 
       return async () => {
         await cleanup();
@@ -956,7 +951,7 @@ describe("drizzle-uow-compiler", () => {
     }, 20000);
 
     function createNestedUOW(name?: string) {
-      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedConfig);
+      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedPool, "postgresql");
       const mockExecutor = {
         executeRetrievalPhase: async () => [],
         executeMutationPhase: async () => ({ success: true, createdInternalIds: [] }),
@@ -984,7 +979,7 @@ describe("drizzle-uow-compiler", () => {
           ),
       );
 
-      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedConfig);
+      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedPool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -1022,7 +1017,7 @@ describe("drizzle-uow-compiler", () => {
           ),
       );
 
-      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedConfig);
+      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedPool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -1055,7 +1050,7 @@ describe("drizzle-uow-compiler", () => {
           ),
       );
 
-      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedConfig);
+      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedPool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -1077,7 +1072,7 @@ describe("drizzle-uow-compiler", () => {
         ),
       );
 
-      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedConfig);
+      const compiler = createDrizzleUOWCompiler(nestedSchema, nestedPool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);

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

@@ -8,13 +8,19 @@ import type {
   UOWCompiler,
 } from "../../query/unit-of-work";
 import { buildCondition, type Condition } from "../../query/condition-builder";
-import type { DrizzleConfig } from "./drizzle-adapter";
-import { type ColumnType, type TableType, type TableNameMapper, parseDrizzle } from "./shared";
+import {
+  type ColumnType,
+  type TableType,
+  type TableNameMapper,
+  parseDrizzle,
+  type DBType,
+} from "./shared";
 import { encodeValues, ReferenceSubquery } from "../../query/result-transform";
 import { serialize } from "../../schema/serialize";
 import { decodeCursor, serializeCursorValues } from "../../query/cursor";
 import type { CompiledJoin } from "../../query/orm/orm";
 import { getOrderedJoinColumns } from "./join-column-utils";
+import type { ConnectionPool } from "../../shared/connection-pool";
 
 export type DrizzleCompiledQuery = {
   sql: string;
@@ -28,19 +34,23 @@ export type DrizzleCompiledQuery = {
  * that can be executed as a batch/transaction.
  *
  * @param schema - The database schema
- * @param config - Drizzle configuration
+ * @param pool - Connection pool for acquiring database connections
+ * @param provider - SQL provider (sqlite, mysql, postgresql)
  * @param mapper - Optional table name mapper for namespace prefixing
  * @param onQuery - Optional callback to receive compiled queries for logging/debugging
  * @returns A UOWCompiler instance for Drizzle
  */
 export function createDrizzleUOWCompiler<TSchema extends AnySchema>(
   schema: TSchema,
-  config: DrizzleConfig,
+  pool: ConnectionPool<DBType>,
+  provider: "sqlite" | "mysql" | "postgresql",
   mapper?: TableNameMapper,
   onQuery?: (query: DrizzleCompiledQuery) => void,
 ): UOWCompiler<TSchema, DrizzleCompiledQuery> {
-  const [db, drizzleTables] = parseDrizzle(config.db);
-  const { provider } = config;
+  // Get db synchronously for compilation (doesn't execute, just builds SQL)
+  // TODO: We don't even need a Drizzle instance with a db client attached here. `drizzle({ schema })` is enough.
+  const dbRaw = pool.getDatabaseSync();
+  const [db, drizzleTables] = parseDrizzle(dbRaw);
 
   /**
    * Convert a Fragno table to a Drizzle table

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

@@ -85,6 +85,11 @@ function getAffectedRows(result: unknown): number {
   }
 
   if (result && typeof result === "object") {
+    // libsql uses rowsAffected
+    if ("rowsAffected" in result && typeof result["rowsAffected"] === "number") {
+      return result["rowsAffected"];
+    }
+
     if ("affectedRows" in result && typeof result["affectedRows"] === "number") {
       return result["affectedRows"];
     }
@@ -114,14 +119,20 @@ async function executeInTransaction(
   db: DBType,
   provider: "sqlite" | "mysql" | "postgresql",
   syncExecutor: (db: SyncSQLiteDB) => void,
-  asyncExecutor: (tx: { execute: (sql: SQL) => Promise<unknown> }) => Promise<void>,
+  asyncExecutor: (tx: {
+    execute?: (sql: SQL) => Promise<unknown>;
+    run?: (sql: SQL) => Promise<unknown>;
+  }) => Promise<void>,
 ): Promise<void> {
   if (provider === "sqlite" && isSyncSQLite(db)) {
     assertSyncSQLite(db);
     db.transaction(() => syncExecutor(db));
   } else {
     await db.transaction(
-      async (tx) => await asyncExecutor(tx as { execute: (sql: SQL) => Promise<unknown> }),
+      async (tx) =>
+        await asyncExecutor(
+          tx as { execute?: (sql: SQL) => Promise<unknown>; run?: (sql: SQL) => Promise<unknown> },
+        ),
     );
   }
 }
@@ -186,7 +197,13 @@ export async function executeDrizzleRetrievalPhase(
     },
     async (tx) => {
       for (const query of retrievalBatch) {
-        const result = (await tx.execute(toSQL(query, provider))) as DrizzleResult;
+        const sqlObj = toSQL(query, provider);
+        // Fallback to run when execute is not available (e.g., libsql)
+        const executeMethod = tx.execute ?? tx.run;
+        if (!executeMethod) {
+          throw new Error("Transaction object has neither execute nor run method");
+        }
+        const result = (await executeMethod.call(tx, sqlObj)) as DrizzleResult;
         retrievalResults.push(result);
       }
     },
@@ -232,7 +249,13 @@ export async function executeDrizzleMutationPhase(
       },
       async (tx) => {
         for (const { query, expectedAffectedRows } of mutationBatch) {
-          const result = await tx.execute(toSQL(query, provider));
+          const sqlObj = toSQL(query, provider);
+          // Fallback to run when execute is not available (e.g., libsql)
+          const executeMethod = tx.execute ?? tx.run;
+          if (!executeMethod) {
+            throw new Error("Transaction object has neither execute nor run method");
+          }
+          const result = await executeMethod.call(tx, sqlObj);
 
           if (expectedAffectedRows === null) {
             createdInternalIds.push(extractCreatedInternalId(result));