Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/small-batches-smile.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@effect/sql-drizzle": patch
---

Support `db.batch` with the SQLite Drizzle integration.
16 changes: 13 additions & 3 deletions packages/sql-drizzle/src/Sqlite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@ import type { SqlError } from "@effect/sql/SqlError"
import type { DrizzleConfig } from "drizzle-orm"
import { QueryPromise } from "drizzle-orm/query-promise"
import { SQLiteSelectBase } from "drizzle-orm/sqlite-core"
import type { SqliteRemoteDatabase } from "drizzle-orm/sqlite-proxy"
import type { AsyncBatchRemoteCallback, AsyncRemoteCallback, SqliteRemoteDatabase } from "drizzle-orm/sqlite-proxy"
import { drizzle } from "drizzle-orm/sqlite-proxy"
import * as Context from "effect/Context"
import * as Effect from "effect/Effect"
import * as Layer from "effect/Layer"
import { makeRemoteCallback, patch } from "./internal/patch.js"

const makeRemoteBatchCallback = (callback: AsyncRemoteCallback): AsyncBatchRemoteCallback => async (queries) => {
const results = []
for (const query of queries) {
results.push(await callback(query.sql, query.params, query.method))
}
return results
}

/**
* @since 1.0.0
* @category constructors
Expand All @@ -21,7 +29,8 @@ export const make = <TSchema extends Record<string, unknown> = Record<string, ne
config?: Omit<DrizzleConfig<TSchema>, "logger">
): Effect.Effect<SqliteRemoteDatabase<TSchema>, never, Client.SqlClient> =>
Effect.gen(function*() {
const db = drizzle(yield* makeRemoteCallback, config)
const callback = yield* makeRemoteCallback
const db = drizzle(callback, makeRemoteBatchCallback(callback), config)
return db
})

Expand All @@ -33,7 +42,8 @@ export const makeWithConfig: (config: DrizzleConfig) => Effect.Effect<SqliteRemo
config
) =>
Effect.gen(function*() {
const db = drizzle(yield* makeRemoteCallback, config)
const callback = yield* makeRemoteCallback
const db = drizzle(callback, makeRemoteBatchCallback(callback), config)
return db
})

Expand Down
17 changes: 17 additions & 0 deletions packages/sql-drizzle/test/Sqlite.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,23 @@ describe("SqliteDrizzle", () => {
assert.deepStrictEqual(results, [{ id: 1, name: "Alice", snakeCase: "snake" }])
}).pipe(Effect.provide(ORM.Client)))

it.effect("batch", () =>
Effect.gen(function*() {
const sql = yield* SqlClient.SqlClient
const db = yield* SqliteDrizzle.SqliteDrizzle
yield* sql`CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT, snake_case TEXT)`
const results = yield* Effect.promise(() =>
db.batch([
db.insert(users).values({ name: "Alice", snakeCase: "snake" }).returning(),
db.select().from(users)
])
)
assert.deepStrictEqual(results, [
[{ id: 1, name: "Alice", snakeCase: "snake" }],
[{ id: 1, name: "Alice", snakeCase: "snake" }]
])
}).pipe(Effect.provide(SqliteDrizzleLive)))

it.effect("remote callback", () =>
Effect.gen(function*() {
const sql = yield* SqlClient.SqlClient
Expand Down