Update sql-drizzle (#4840)

Co-authored-by: Tim <[email protected]>

Author: mikearnaldi

.changeset/ten-dots-sort.md

@@ -0,0 +1,5 @@
+---
+"@effect/sql-drizzle": minor
+---
+
+Widen sql-drizzle to latest

packages/sql-drizzle/package.json

@@ -57,14 +57,14 @@
     "@effect/sql-mysql2": "workspace:^",
     "@effect/sql-pg": "workspace:^",
     "@effect/sql-sqlite-node": "workspace:^",
-    "@testcontainers/mysql": "^10.18.0",
-    "@testcontainers/postgresql": "^10.18.0",
-    "drizzle-orm": "^0.42.0",
+    "@testcontainers/mysql": "^10.25.0",
+    "@testcontainers/postgresql": "^10.25.0",
+    "drizzle-orm": "^0.43.1",
     "effect": "workspace:^"
   },
   "peerDependencies": {
     "@effect/sql": "workspace:^",
-    "drizzle-orm": "^0.42",
+    "drizzle-orm": ">=0.43.1 <0.50",
     "effect": "workspace:^"
   }
 }

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

@@ -68,13 +68,14 @@ export const makeRemoteCallback = Effect.gen(function*() {
   const runPromise = Runtime.runPromise(runtime)
   return (sql: string, params: Array<any>, method: "all" | "execute" | "get" | "values" | "run") => {
     const statement = client.unsafe(sql, params)
+    if (method === "execute") {
+      return runPromise(Effect.map(statement.raw, (header) => ({ rows: [header] })))
+    }
     let effect: Effect.Effect<any, SqlError> = method === "all" || method === "values"
       ? statement.values
       : statement.withoutTransform
     if (method === "get") {
       effect = Effect.map(effect, (rows) => rows[0] ?? [])
-    } else if (method === "execute") {
-      effect = Effect.map(effect, (rows) => rows.length ? rows : [{}])
     }
     return runPromise(Effect.map(effect, (rows) => ({ rows })))
   }

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

@@ -31,9 +31,34 @@ describe.sequential("Mysql", () => {
       const sql = yield* SqlClient.SqlClient
       const db = yield* MysqlDrizzle
       yield* sql`CREATE TABLE users (id SERIAL PRIMARY KEY, name TEXT NOT NULL, snake_case TEXT NOT NULL)`
-      yield* Effect.promise(() => db.insert(users).values({ name: "Alice", snakeCase: "snake" }))
+      const rows = yield* Effect.promise(() =>
+        db.insert(users).values({ name: "Alice", snakeCase: "snake" }).$returningId()
+      )
       const results = yield* Effect.promise(() => db.select().from(users))
       assert.deepStrictEqual(results, [{ id: 1, name: "Alice", snakeCase: "snake" }])
+      assert.deepStrictEqual(rows, [{ id: 1 }])
+    }).pipe(
+      Effect.provide(DrizzleMysqlLive),
+      Effect.catchTag("ContainerError", () => Effect.void)
+    ), { timeout: 60000 })
+
+  it.effect("remote callback multiple values", () =>
+    Effect.gen(function*(_) {
+      const sql = yield* SqlClient.SqlClient
+      const db = yield* MysqlDrizzle
+      yield* sql`CREATE TABLE users (id SERIAL PRIMARY KEY, name TEXT NOT NULL, snake_case TEXT NOT NULL)`
+      const rows = yield* Effect.promise(() =>
+        db.insert(users).values([
+          { name: "Alice", snakeCase: "snake" },
+          { name: "Bob", snakeCase: "snake" }
+        ]).$returningId()
+      )
+      const results = yield* Effect.promise(() => db.select().from(users))
+      assert.deepStrictEqual(results, [
+        { id: 1, name: "Alice", snakeCase: "snake" },
+        { id: 2, name: "Bob", snakeCase: "snake" }
+      ])
+      assert.deepStrictEqual(rows, [{ id: 1 }, { id: 2 }])
     }).pipe(
       Effect.provide(DrizzleMysqlLive),
       Effect.catchTag("ContainerError", () => Effect.void)