Rethrow original cause from makeRemoteCallback (#5503)

Co-authored-by: Laure Retru-Chavastel <laure.retruchavastel@gmail.com>

Author: mikearnaldi

packages/sql-drizzle/src/internal/patch.ts

@@ -49,14 +49,24 @@ export const makeRemoteCallback = Effect.gen(function*() {
     const runPromise = Runtime.runPromise(currentRuntime ? currentRuntime : constructionRuntime)
     const statement = client.unsafe(sql, params)
     if (method === "execute") {
-      return runPromise(Effect.map(statement.raw, (header) => ({ rows: [header] })))
+      return runPromise(Effect.either(Effect.map(statement.raw, (header) => ({ rows: [header] })))).then((res) => {
+        if (res._tag === "Left") {
+          throw res.left.cause
+        }
+        return res.right
+      })
     }
     let effect: Effect.Effect<any, SqlError> = method === "all" || method === "values"
       ? statement.values
       : statement.withoutTransform
     if (method === "get") {
       effect = Effect.map(effect, (rows) => rows[0] ?? [])
     }
-    return runPromise(Effect.map(effect, (rows) => ({ rows })))
+    return runPromise(Effect.either(Effect.map(effect, (rows) => ({ rows })))).then((res) => {
+      if (res._tag === "Left") {
+        throw res.left.cause
+      }
+      return res.right
+    })
   }
 })

packages/sql-drizzle/test/Pg.test.ts

@@ -3,6 +3,8 @@ import * as Pg from "@effect/sql-drizzle/Pg"
 import { assert, describe, it } from "@effect/vitest"
 import * as D from "drizzle-orm/pg-core"
 import { Effect, Layer } from "effect"
+import * as Logger from "effect/Logger"
+import * as LogLevel from "effect/LogLevel"
 import { PgContainer } from "./utils-pg.js"
 import { DrizzlePgLive } from "./utils.js"
 
@@ -63,4 +65,30 @@ describe.sequential("Pg", () => {
     ), {
     timeout: 60000
   })
+
+  it.effect("fail properly for conflict issues", () => {
+    const logs: Array<unknown> = []
+    const logger = Logger.make((opts) => {
+      globalThis.console.log(opts)
+      return logs.push(opts.message)
+    })
+    return Effect.gen(function*() {
+      const sql = yield* SqlClient.SqlClient
+      const db = yield* Pg.PgDrizzle
+
+      yield* sql`CREATE TABLE users (id SERIAL PRIMARY KEY, name TEXT NOT NULL UNIQUE, snake_case TEXT NOT NULL)`
+      yield* db.insert(users).values({ name: "Alice", snakeCase: "test" })
+      yield* Effect.flip(
+        db.insert(users).values({ name: "Alice", snakeCase: "test" })
+      )
+      assert.deepEqual(logs, [])
+    }).pipe(
+      Effect.provide([
+        DrizzlePgLive,
+        Logger.replace(Logger.defaultLogger, logger),
+        Logger.minimumLogLevel(LogLevel.Debug)
+      ]),
+      Effect.catchTag("ContainerError", () => Effect.void)
+    )
+  }, { timeout: 60000 })
 })