Isolate compiled SQL fragment caches by compiler instance

.changeset/isolate-sql-compiler-cache.md

@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Isolate compiled SQL fragment caches by compiler instance.

packages/effect/src/unstable/sql/Statement.ts

@@ -799,22 +799,25 @@ export const makeCompiler = <C extends Custom<any, any, any, any> = any>(
   self.options = options
   self.dialect = options.dialect
   self.disableTransforms = false
+  self.statementCache = new WeakMap<Fragment, CompiledStatement>()
+  self.statementCacheNoTransform = new WeakMap<Fragment, CompiledStatement>()
   return self
 }
 
+type CompiledStatement = readonly [sql: string, binds: ReadonlyArray<unknown>]
+
 interface CompilerImpl extends Compiler {
   readonly options: CompilerOptions
   readonly disableTransforms: boolean
+  readonly statementCache: WeakMap<Fragment, CompiledStatement>
+  readonly statementCacheNoTransform: WeakMap<Fragment, CompiledStatement>
   compile(
     statement: Fragment,
     withoutTransform?: boolean,
     placeholderOverride?: (u: unknown) => string
-  ): readonly [sql: string, binds: ReadonlyArray<unknown>]
+  ): CompiledStatement
 }
 
-const statementCacheSymbol = Symbol.for("effect/unstable/sql/Statement/statementCache")
-const statementCacheNoTransformSymbol = Symbol.for("effect/unstable/sql/Statement/statementCacheNoTransform")
-
 const CompilerProto = {
   compile(
     this: CompilerImpl,
@@ -824,9 +827,10 @@ const CompilerProto = {
   ): readonly [sql: string, binds: ReadonlyArray<unknown>] {
     const opts = this.options
     withoutTransform = withoutTransform || this.disableTransforms
-    const cacheSymbol = withoutTransform ? statementCacheNoTransformSymbol : statementCacheSymbol
-    if (cacheSymbol in statement) {
-      return (statement as any)[cacheSymbol]
+    const cache = withoutTransform ? this.statementCacheNoTransform : this.statementCache
+    const cached = cache.get(statement)
+    if (cached !== undefined) {
+      return cached
     }
 
     const segments = statement.segments
@@ -1033,7 +1037,8 @@ const CompilerProto = {
     if (placeholderOverride !== undefined) {
       return result
     }
-    return (statement as any)[cacheSymbol] = result
+    cache.set(statement, result)
+    return result
   },
 
   get withoutTransform() {

packages/effect/test/unstable/sql/Statement.test.ts

@@ -14,4 +14,22 @@ describe("Statement", () => {
     assert.deepStrictEqual(nested.array([[row]]), [[{ OWN: 2 }]])
     assert.deepStrictEqual(flat.array([row]), [{ OWN: 2 }])
   })
+
+  it("compiles one fragment independently for each compiler", () => {
+    const postgres = Statement.makeCompiler({
+      dialect: "pg",
+      placeholder: (index) => `$${index}`,
+      onIdentifier: Statement.defaultEscape("\""),
+      onRecordUpdate: () => ["", []],
+      onCustom: () => ["", []]
+    })
+    const sqlite = Statement.makeCompilerSqlite()
+    const fragment = Statement.fragment([
+      Statement.identifier("value"),
+      Statement.parameter(1)
+    ])
+
+    assert.deepStrictEqual(postgres.compile(fragment, false), ["\"value\"$1", [1]])
+    assert.deepStrictEqual(sqlite.compile(fragment, false), ["\"value\"?", [1]])
+  })
 })