@effect/sql-d1 4.0.0-beta.102 → 4.0.0-beta.104

package/dist/D1Client.d.ts

@@ -19,6 +19,8 @@ import * as Layer from "effect/Layer";
 import type * as Scope from "effect/Scope";
 import * as Reactivity from "effect/unstable/reactivity/Reactivity";
 import * as Client from "effect/unstable/sql/SqlClient";
+import { SqlError } from "effect/unstable/sql/SqlError";
+import * as Statement from "effect/unstable/sql/Statement";
 /**
  * Unique runtime identifier used to tag `D1Client` values.
  *
@@ -36,12 +38,31 @@ export type TypeId = "~@effect/sql-d1/D1Client";
 /**
  * Cloudflare D1 SQL client service, extending `SqlClient` with its D1 configuration and no `updateValues` support.
  *
- * @category models
+ * @category services
  * @since 4.0.0
  */
 export interface D1Client extends Client.SqlClient {
     readonly [TypeId]: TypeId;
     readonly config: D1ClientConfig;
+    /**
+     * Executes SQL statements as a single atomic D1 batch and returns their row results in order.
+     *
+     * **When to use**
+     *
+     * Use when you have a fixed collection of statements that should run in one
+     * request and roll back together if any statement fails.
+     *
+     * **Gotchas**
+     *
+     * Each statement uses the query and result name transformations from the
+     * client that created it. Mixing clients can produce differently shaped row
+     * results within the same batch.
+     *
+     * @since 4.0.0
+     */
+    readonly batch: <const Statements extends ReadonlyArray<Statement.Statement<any>>>(statements: Statements) => Effect.Effect<{
+        readonly [K in keyof Statements]: Effect.Success<Statements[K]>;
+    }, SqlError>;
     /** Not supported in d1 */
     readonly updateValues: never;
 }

package/dist/D1Client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"D1Client.d.ts","sourceRoot":"","sources":["../src/D1Client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,UAAU,EAAuB,MAAM,2BAA2B,CAAA;AAEhF,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAE1C,OAAO,KAAK,UAAU,MAAM,uCAAuC,CAAA;AACnE,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAA;AAUvD;;;;;GAKG;AACH,eAAO,MAAM,MAAM,EAAE,MAAmC,CAAA;AAExD;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG,0BAA0B,CAAA;AAE/C;;;;;GAKG;AACH,MAAM,WAAW,QAAS,SAAQ,MAAM,CAAC,SAAS;IAChD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAA;IAE/B,0BAA0B;IAC1B,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAA;CAC7B;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,qCAAuD,CAAA;AAE5E;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAA;IACvB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAA;IACrD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAE7D,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;IACrE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CACrE;AAED;;;;;GAKG;AACH,eAAO,MAAM,IAAI,YACN,cAAc,KACtB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAkIjE,CAAA;AAEJ;;;;;GAKG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KAClC,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAUrB,CAAA;AAEzC;;;;;GAKG;AACH,eAAO,MAAM,KAAK,WACR,cAAc,KACrB,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAMrB,CAAA"}
+{"version":3,"file":"D1Client.d.ts","sourceRoot":"","sources":["../src/D1Client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,UAAU,EAAuB,MAAM,2BAA2B,CAAA;AAEhF,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAE1C,OAAO,KAAK,UAAU,MAAM,uCAAuC,CAAA;AACnE,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAA;AAEvD,OAAO,EAAE,QAAQ,EAAgB,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAA;AAS1D;;;;;GAKG;AACH,eAAO,MAAM,MAAM,EAAE,MAAmC,CAAA;AAExD;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG,0BAA0B,CAAA;AAE/C;;;;;GAKG;AACH,MAAM,WAAW,QAAS,SAAQ,MAAM,CAAC,SAAS;IAChD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAA;IAE/B;;;;;;;;;;;;;;;OAeG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,UAAU,SAAS,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAC/E,UAAU,EAAE,UAAU,KACnB,MAAM,CAAC,MAAM,CAChB;QACE,QAAQ,EAAE,CAAC,IAAI,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KAChE,EACD,QAAQ,CACT,CAAA;IAED,0BAA0B;IAC1B,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAA;CAC7B;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,qCAAuD,CAAA;AAE5E;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAA;IACvB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAA;IACrD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAE7D,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;IACrE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CACrE;AA0ED;;;;;GAKG;AACH,eAAO,MAAM,IAAI,YACN,cAAc,KACtB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAsKjE,CAAA;AAEJ;;;;;GAKG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KAClC,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAUrB,CAAA;AAEzC;;;;;GAKG;AACH,eAAO,MAAM,KAAK,WACR,cAAc,KACrB,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAMrB,CAAA"}

package/dist/D1Client.js

@@ -11,6 +11,8 @@ import * as Client from "effect/unstable/sql/SqlClient";
 import { SqlError, UnknownError } from "effect/unstable/sql/SqlError";
 import * as Statement from "effect/unstable/sql/Statement";
 const ATTR_DB_SYSTEM_NAME = "db.system.name";
+const ATTR_DB_OPERATION_NAME = "db.operation.name";
+const ATTR_DB_QUERY_TEXT = "db.query.text";
 const classifyError = (cause, message, operation) => new UnknownError({
   cause,
   message,
@@ -35,6 +37,51 @@ export const TypeId = "~@effect/sql-d1/D1Client";
  * @since 4.0.0
  */
 export const D1Client = /*#__PURE__*/Context.Service("@effect/sql-d1/D1Client");
+const makeBatch = options => statements => {
+  if (statements.length === 0) {
+    return Effect.succeed([]);
+  }
+  return Effect.useSpan("sql.execute", {
+    kind: "client"
+  }, span => Effect.withFiber(Effect.fnUntraced(function* (fiber) {
+    const transformer = fiber.getRef(Statement.CurrentTransformer);
+    const prepared = [];
+    const transforms = [];
+    const queryTexts = [];
+    for (const original of statements) {
+      const statement = transformer === undefined ? original : yield* transformer(original, options.getClient(), fiber, span);
+      const [sql, params] = statement.compile();
+      queryTexts.push(sql);
+      transforms.push(statement.transformRows);
+      prepared.push((yield* Cache.get(options.prepareCache, sql)).bind(...params));
+    }
+    for (const [key, value] of options.spanAttributes) {
+      span.attribute(key, value);
+    }
+    span.attribute(ATTR_DB_OPERATION_NAME, "batch");
+    span.attribute(ATTR_DB_QUERY_TEXT, queryTexts.join("; "));
+    // D1 batches execute on the binding directly and intentionally cannot participate in SqlClient transactions.
+    const responses = yield* Effect.tryPromise({
+      try: () => options.db.batch(prepared).then(responses => {
+        for (const response of responses) {
+          if (response.error) {
+            throw response.error;
+          }
+        }
+        return responses;
+      }),
+      catch: cause => new SqlError({
+        reason: classifyError(cause, "Failed to execute batch", "execute")
+      })
+    });
+    const results = responses.map((response, index) => {
+      const rows = response.results || [];
+      const transformRows = transforms[index];
+      return transformRows ? transformRows(rows) : rows;
+    });
+    return results;
+  })));
+};
 /**
  * Creates a scoped Cloudflare D1 SQL client. Prepared statements are cached, while transactions and streaming queries are not supported by this driver.
  *
@@ -44,6 +91,7 @@ export const D1Client = /*#__PURE__*/Context.Service("@effect/sql-d1/D1Client");
 export const make = options => Effect.gen(function* () {
   const compiler = Statement.makeCompilerSqlite(options.transformQueryNames);
   const transformRows = options.transformResultNames ? Statement.defaultTransforms(options.transformResultNames).array : undefined;
+  const spanAttributes = [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [ATTR_DB_SYSTEM_NAME, "sqlite"]];
   const makeConnection = Effect.gen(function* () {
     const db = options.db;
     const prepareCache = yield* Cache.make({
@@ -87,7 +135,7 @@ export const make = options => Effect.gen(function* () {
         reason: classifyError(cause, "Failed to execute statement", "execute")
       })
     });
-    return identity({
+    const connection = identity({
       execute(sql, params, transformRows) {
         return transformRows ? Effect.map(runCached(sql, params), transformRows) : runCached(sql, params);
       },
@@ -107,20 +155,59 @@ export const make = options => Effect.gen(function* () {
         return Stream.die("executeStream not implemented");
       }
     });
+    return {
+      connection,
+      prepareCache
+    };
   });
-  const connection = yield* makeConnection;
+  const {
+    connection,
+    prepareCache
+  } = yield* makeConnection;
   const acquirer = Effect.succeed(connection);
   const transactionAcquirer = Effect.die("transactions are not supported in D1");
-  return Object.assign(yield* Client.make({
+  let client;
+  client = Object.assign(yield* Client.make({
     acquirer,
     compiler,
     transactionAcquirer,
-    spanAttributes: [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [ATTR_DB_SYSTEM_NAME, "sqlite"]],
+    spanAttributes,
     transformRows
   }), {
     [TypeId]: TypeId,
-    config: options
+    config: options,
+    batch: makeBatch({
+      db: options.db,
+      prepareCache,
+      spanAttributes,
+      getClient: () => client
+    })
   });
+  if (options.transformQueryNames !== undefined || transformRows !== undefined) {
+    const clientWithoutTransformsBase = yield* Client.make({
+      acquirer: Effect.succeed(connection),
+      compiler: compiler.withoutTransform,
+      transactionAcquirer,
+      spanAttributes,
+      transformRows: undefined
+    });
+    let clientWithoutTransforms;
+    clientWithoutTransforms = Object.assign(clientWithoutTransformsBase, {
+      [TypeId]: TypeId,
+      config: options,
+      batch: makeBatch({
+        db: options.db,
+        prepareCache,
+        spanAttributes,
+        getClient: () => clientWithoutTransforms
+      }),
+      withoutTransforms: () => clientWithoutTransforms
+    });
+    Object.assign(client, {
+      withoutTransforms: () => clientWithoutTransforms
+    });
+  }
+  return client;
 });
 /**
  * Creates a layer from a `Config`-wrapped D1 client configuration, providing both `D1Client` and `SqlClient`.

package/dist/D1Client.js.map

@@ -1 +1 @@
-{"version":3,"file":"D1Client.js","names":["Cache","Config","Context","Duration","Effect","identity","Layer","Stream","Reactivity","Client","SqlError","UnknownError","Statement","ATTR_DB_SYSTEM_NAME","classifyError","cause","message","operation","TypeId","D1Client","Service","make","options","gen","compiler","makeCompilerSqlite","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","makeConnection","db","prepareCache","capacity","prepareCacheSize","timeToLive","prepareCacheTTL","minutes","lookup","sql","try","prepare","catch","reason","runStatement","statement","params","tryPromise","response","bind","all","error","results","runRaw","runCached","flatMap","get","s","runUncached","runValues","raw","runValuesUncached","execute","map","executeRaw","executeValues","executeValuesUnprepared","executeUnprepared","executeStream","_sql","_params","die","connection","acquirer","succeed","transactionAcquirer","Object","assign","spanAttributes","entries","config","layerConfig","effectContext","unwrap","pipe","client","add","SqlClient","provide","layer"],"sources":["../src/D1Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"D1Client.js","names":[],"sources":["../src/D1Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["D1Client"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;AAEA;;;AAGA,OAAO,KAAKA,QAAQ,MAAM,eAAe","ignoreList":[]}
+{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;AAEA;;;AAGA,OAAO,KAAK,QAAQ,MAAM,eAAe","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-d1",
-  "version": "4.0.0-beta.102",
+  "version": "4.0.0-beta.104",
   "type": "module",
   "license": "MIT",
   "description": "A Cloudflare D1 integration for Effect",
@@ -33,6 +33,7 @@
     ".": "./dist/index.js",
     "./*": "./dist/*.js",
     "./internal/*": null,
+    "./index": null,
     "./*/index": null
   },
   "files": [
@@ -48,10 +49,10 @@
   },
   "devDependencies": {
     "miniflare": "^4.20260706.0",
-    "effect": "^4.0.0-beta.102"
+    "effect": "^4.0.0-beta.104"
   },
   "peerDependencies": {
-    "effect": "^4.0.0-beta.102"
+    "effect": "^4.0.0-beta.104"
   },
   "dependencies": {
     "@cloudflare/workers-types": "^5.20260708.1"
@@ -60,8 +61,6 @@
     "codegen": "effect-utils codegen",
     "build": "tsc -b tsconfig.json && pnpm babel",
     "babel": "babel dist --plugins annotate-pure-calls --out-dir dist --source-maps",
-    "check": "tsc -b tsconfig.json",
-    "test": "vitest",
-    "coverage": "vitest --coverage"
+    "check": "tsc -b tsconfig.json"
   }
 }

package/src/D1Client.ts

@@ -27,6 +27,8 @@ import { SqlError, UnknownError } from "effect/unstable/sql/SqlError"
 import * as Statement from "effect/unstable/sql/Statement"
 
 const ATTR_DB_SYSTEM_NAME = "db.system.name"
+const ATTR_DB_OPERATION_NAME = "db.operation.name"
+const ATTR_DB_QUERY_TEXT = "db.query.text"
 
 const classifyError = (cause: unknown, message: string, operation: string) =>
   new UnknownError({ cause, message, operation })
@@ -50,13 +52,38 @@ export type TypeId = "~@effect/sql-d1/D1Client"
 /**
  * Cloudflare D1 SQL client service, extending `SqlClient` with its D1 configuration and no `updateValues` support.
  *
- * @category models
+ * @category services
  * @since 4.0.0
  */
 export interface D1Client extends Client.SqlClient {
   readonly [TypeId]: TypeId
   readonly config: D1ClientConfig
 
+  /**
+   * Executes SQL statements as a single atomic D1 batch and returns their row results in order.
+   *
+   * **When to use**
+   *
+   * Use when you have a fixed collection of statements that should run in one
+   * request and roll back together if any statement fails.
+   *
+   * **Gotchas**
+   *
+   * Each statement uses the query and result name transformations from the
+   * client that created it. Mixing clients can produce differently shaped row
+   * results within the same batch.
+   *
+   * @since 4.0.0
+   */
+  readonly batch: <const Statements extends ReadonlyArray<Statement.Statement<any>>>(
+    statements: Statements
+  ) => Effect.Effect<
+    {
+      readonly [K in keyof Statements]: Effect.Success<Statements[K]>
+    },
+    SqlError
+  >
+
   /** Not supported in d1 */
   readonly updateValues: never
 }
@@ -90,6 +117,78 @@ export interface D1ClientConfig {
   readonly transformQueryNames?: ((str: string) => string) | undefined
 }
 
+type TransformRows = <A extends object>(rows: ReadonlyArray<A>) => ReadonlyArray<A>
+
+type BatchResults<Statements extends ReadonlyArray<Statement.Statement<any>>> = {
+  readonly [K in keyof Statements]: Effect.Success<Statements[K]>
+}
+
+interface StatementWithTransformRows extends Statement.Statement<any> {
+  readonly transformRows: TransformRows | undefined
+}
+
+const makeBatch = (options: {
+  readonly db: D1Database
+  readonly prepareCache: Cache.Cache<string, D1PreparedStatement, SqlError>
+  readonly spanAttributes: ReadonlyArray<readonly [string, unknown]>
+  readonly getClient: () => D1Client
+}): D1Client["batch"] =>
+<const Statements extends ReadonlyArray<Statement.Statement<any>>>(
+  statements: Statements
+) => {
+  if (statements.length === 0) {
+    return Effect.succeed([] as unknown as BatchResults<Statements>)
+  }
+  return Effect.useSpan(
+    "sql.execute",
+    { kind: "client" },
+    (span) =>
+      Effect.withFiber(Effect.fnUntraced(function*(fiber) {
+        const transformer = fiber.getRef(Statement.CurrentTransformer)
+        const prepared: Array<D1PreparedStatement> = []
+        const transforms: Array<TransformRows | undefined> = []
+        const queryTexts: Array<string> = []
+
+        for (const original of statements) {
+          const statement = transformer === undefined
+            ? original
+            : yield* transformer(original, options.getClient(), fiber, span)
+          const [sql, params] = statement.compile()
+          queryTexts.push(sql)
+          transforms.push((statement as StatementWithTransformRows).transformRows)
+          prepared.push((yield* Cache.get(options.prepareCache, sql)).bind(...params))
+        }
+
+        for (const [key, value] of options.spanAttributes) {
+          span.attribute(key, value)
+        }
+        span.attribute(ATTR_DB_OPERATION_NAME, "batch")
+        span.attribute(ATTR_DB_QUERY_TEXT, queryTexts.join("; "))
+
+        // D1 batches execute on the binding directly and intentionally cannot participate in SqlClient transactions.
+        const responses = yield* Effect.tryPromise({
+          try: () =>
+            options.db.batch<Record<string, unknown>>(prepared).then((responses) => {
+              for (const response of responses) {
+                if (response.error) {
+                  throw response.error
+                }
+              }
+              return responses
+            }),
+          catch: (cause) => new SqlError({ reason: classifyError(cause, "Failed to execute batch", "execute") })
+        })
+
+        const results = responses.map((response, index) => {
+          const rows = response.results || []
+          const transformRows = transforms[index]
+          return transformRows ? transformRows(rows) : rows
+        })
+        return results as BatchResults<Statements>
+      }))
+  )
+}
+
 /**
  * Creates a scoped Cloudflare D1 SQL client. Prepared statements are cached, while transactions and streaming queries are not supported by this driver.
  *
@@ -104,6 +203,10 @@ export const make = (
     const transformRows = options.transformResultNames ?
       Statement.defaultTransforms(options.transformResultNames).array :
       undefined
+    const spanAttributes: Array<readonly [string, unknown]> = [
+      ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
+      [ATTR_DB_SYSTEM_NAME, "sqlite"]
+    ]
 
     const makeConnection = Effect.gen(function*() {
       const db = options.db
@@ -182,7 +285,7 @@ export const make = (
           catch: (cause) => new SqlError({ reason: classifyError(cause, "Failed to execute statement", "execute") })
         })
 
-      return identity<Connection>({
+      const connection = identity<Connection>({
         execute(sql, params, transformRows) {
           return transformRows
             ? Effect.map(runCached(sql, params), transformRows)
@@ -206,28 +309,60 @@ export const make = (
           return Stream.die("executeStream not implemented")
         }
       })
+      return { connection, prepareCache } as const
     })
 
-    const connection = yield* makeConnection
+    const { connection, prepareCache } = yield* makeConnection
     const acquirer = Effect.succeed(connection)
     const transactionAcquirer = Effect.die("transactions are not supported in D1")
 
-    return Object.assign(
+    let client!: D1Client
+    client = Object.assign(
       (yield* Client.make({
         acquirer,
         compiler,
         transactionAcquirer,
-        spanAttributes: [
-          ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
-          [ATTR_DB_SYSTEM_NAME, "sqlite"]
-        ],
+        spanAttributes,
         transformRows
       })) as D1Client,
       {
         [TypeId]: TypeId as TypeId,
-        config: options
+        config: options,
+        batch: makeBatch({
+          db: options.db,
+          prepareCache,
+          spanAttributes,
+          getClient: () => client
+        })
       }
     )
+
+    if (options.transformQueryNames !== undefined || transformRows !== undefined) {
+      const clientWithoutTransformsBase = yield* Client.make({
+        acquirer: Effect.succeed(connection),
+        compiler: compiler.withoutTransform,
+        transactionAcquirer,
+        spanAttributes,
+        transformRows: undefined
+      })
+      let clientWithoutTransforms!: D1Client
+      clientWithoutTransforms = Object.assign(clientWithoutTransformsBase as D1Client, {
+        [TypeId]: TypeId as TypeId,
+        config: options,
+        batch: makeBatch({
+          db: options.db,
+          prepareCache,
+          spanAttributes,
+          getClient: () => clientWithoutTransforms
+        }),
+        withoutTransforms: () => clientWithoutTransforms
+      })
+      Object.assign(client, {
+        withoutTransforms: () => clientWithoutTransforms
+      })
+    }
+
+    return client
   })
 
 /**