wip

Effect-TS · Oct 31, 2024 · 4712ccd · 4712ccd
1 parent 95e936d
commit 4712ccd
Showing 1 changed file with 29 additions and 27 deletions.
diff --git a/packages/sql-clickhouse/src/ClickhouseClient.ts b/packages/sql-clickhouse/src/ClickhouseClient.ts
@@ -55,11 +55,11 @@ export interface ClickhouseClient extends Client.SqlClient {
   }
   readonly withClickhouseSettings: {
     (
-      settings: Clickhouse.BaseQueryParams["clickhouse_settings"]
+      settings: NonNullable<Clickhouse.BaseQueryParams["clickhouse_settings"]>
     ): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
     <A, E, R>(
       effect: Effect.Effect<A, E, R>,
-      settings: Clickhouse.BaseQueryParams["clickhouse_settings"]
+      settings: NonNullable<Clickhouse.BaseQueryParams["clickhouse_settings"]>
     ): Effect.Effect<A, E, R>
   }
 }
@@ -243,34 +243,36 @@ export const make = (
           readonly values: Clickhouse.InsertValues<Readable, T>
           readonly format?: Clickhouse.DataFormat
         }) {
-          return FiberRef.getWith(currentClickhouseSettings, (settings_) =>
-            FiberRef.getWith(currentQueryId, (queryId_) =>
-              Effect.async<Clickhouse.InsertResult, SqlError>((resume) => {
-                const queryId = queryId_ ?? Crypto.randomUUID()
-                const settings = settings_ ?? {}
-                const controller = new AbortController()
-                client.insert({
-                  format: "JSONEachRow",
-                  ...options,
-                  abort_signal: controller.signal,
-                  query_id: queryId,
-                  clickhouse_settings: settings
-                }).then(
-                  (result) =>
-                    resume(Effect.succeed(result)),
-                  (cause) => resume(Effect.fail(new SqlError({ cause, message: "Failed to insert data" })))
-                )
-                return Effect.suspend(() => {
-                  controller.abort()
-                  return Effect.promise(() => client.command({ query: `KILL QUERY WHERE query_id = '${queryId}'` }))
-                })
-              })))
+          return Effect.withFiberRuntime<Clickhouse.InsertResult, SqlError>((fiber) =>
+            Effect.async((resume) => {
+              const queryId = fiber.getFiberRef(currentQueryId) ?? Crypto.randomUUID()
+              const settings = fiber.getFiberRef(currentClickhouseSettings)
+              const controller = new AbortController()
+              client.insert({
+                format: "JSONEachRow",
+                ...options,
+                abort_signal: controller.signal,
+                query_id: queryId,
+                clickhouse_settings: settings
+              }).then(
+                (result) => resume(Effect.succeed(result)),
+                (cause) => resume(Effect.fail(new SqlError({ cause, message: "Failed to insert data" })))
+              )
+              return Effect.suspend(() => {
+                controller.abort()
+                return Effect.promise(() => client.command({ query: `KILL QUERY WHERE query_id = '${queryId}'` }))
+              })
+            })
+          )
         },
         withQueryId: dual(2, <A, E, R>(effect: Effect.Effect<A, E, R>, queryId: string) =>
           Effect.locally(effect, currentQueryId, queryId)),
         withClickhouseSettings: dual(
           2,
-          <A, E, R>(effect: Effect.Effect<A, E, R>, settings: Clickhouse.BaseQueryParams["clickhouse_settings"]) =>
+          <A, E, R>(
+            effect: Effect.Effect<A, E, R>,
+            settings: NonNullable<Clickhouse.BaseQueryParams["clickhouse_settings"]>
+          ) =>
             Effect.locally(effect, currentClickhouseSettings, settings)
         )
       }
@@ -300,10 +302,10 @@ export const currentQueryId: FiberRef.FiberRef<string | undefined> = globalValue
  * @since 1.0.0
  */
 export const currentClickhouseSettings: FiberRef.FiberRef<
-  Clickhouse.BaseQueryParams["clickhouse_settings"] | undefined
+  NonNullable<Clickhouse.BaseQueryParams["clickhouse_settings"]>
 > = globalValue(
   "@effect/sql-clickhouse/ClickhouseClient/currentClickhouseSettings",
-  () => FiberRef.unsafeMake<Clickhouse.BaseQueryParams["clickhouse_settings"] | undefined>(undefined)
+  () => FiberRef.unsafeMake({})
 )
 
 /**