@effect/sql-clickhouse 4.0.0-beta.99 → 4.0.0-rc.108

package/src/ClickhouseClient.ts

@@ -104,7 +104,7 @@ export type TypeId = "~@effect/sql-clickhouse/ClickhouseClient"
  * typed parameter fragments, command-mode execution, insert queries, and
  * per-effect query ID and ClickHouse settings.
  *
- * @category models
+ * @category services
  * @since 4.0.0
  */
 export interface ClickhouseClient extends Client.SqlClient {
@@ -149,7 +149,7 @@ export const ClickhouseClient = Context.Service<ClickhouseClient>("@effect/sql-c
  * `@clickhouse/client` options with optional span attributes and query/result
  * name transforms.
  *
- * @category constructors
+ * @category models
  * @since 4.0.0
  */
 export interface ClickhouseClientConfig extends Clickhouse.ClickHouseClientConfigOptions {
@@ -175,16 +175,16 @@ export const make = (
       ? Statement.defaultTransforms(options.transformResultNames).array
       : undefined
 
-    const client = Clickhouse.createClient(options)
+    const client = yield* Effect.acquireRelease(
+      Effect.sync(() => Clickhouse.createClient(options)),
+      (client) => Effect.promise(() => client.close())
+    )
 
-    yield* Effect.acquireRelease(
-      Effect.tryPromise({
-        try: () => client.exec({ query: "SELECT 1" }),
-        catch: (cause) =>
-          new SqlError({ reason: classifyError(cause, "ClickhouseClient: Failed to connect", "connect", "connection") })
-      }),
-      () => Effect.promise(() => client.close())
-    ).pipe(
+    yield* Effect.tryPromise({
+      try: () => client.exec({ query: "SELECT 1" }),
+      catch: (cause) =>
+        new SqlError({ reason: classifyError(cause, "ClickhouseClient: Failed to connect", "connect", "connection") })
+    }).pipe(
       Effect.timeoutOrElse({
         duration: Duration.seconds(5),
         orElse: () =>
@@ -253,7 +253,12 @@ export const make = (
             }
             return Effect.suspend(() => {
               controller.abort()
-              return Effect.promise(() => this.conn.command({ query: `KILL QUERY WHERE query_id = '${queryId}'` }))
+              return Effect.promise(() =>
+                this.conn.command({
+                  query: "KILL QUERY WHERE query_id = {queryId:String}",
+                  query_params: { queryId }
+                })
+              )
             })
           })
         })
@@ -263,12 +268,11 @@ export const make = (
         return this.runRaw(sql, params, format).pipe(
           Effect.flatMap((result) => {
             if ("json" in result) {
-              return Effect.promise(() =>
-                result.json().then(
-                  (result) => "data" in result ? result.data : result as any,
-                  () => []
-                )
-              )
+              return Effect.tryPromise({
+                try: () => result.json().then((result) => "data" in result ? result.data : result as any),
+                catch: (cause) =>
+                  new SqlError({ reason: classifyError(cause, "Failed to parse result", "parseResult") })
+              })
             }
             return Effect.succeed([])
           })
@@ -376,7 +380,12 @@ export const make = (
             )
             return Effect.suspend(() => {
               controller.abort()
-              return Effect.promise(() => client.command({ query: `KILL QUERY WHERE query_id = '${queryId}'` }))
+              return Effect.promise(() =>
+                client.command({
+                  query: "KILL QUERY WHERE query_id = {queryId:String}",
+                  query_params: { queryId }
+                })
+              )
             })
           })
         },
@@ -399,7 +408,7 @@ export const make = (
  * Fiber reference read by the low-level ClickHouse connection to choose query
  * or command execution for statements; defaults to `query`.
  *
- * @category references
+ * @category services
  * @since 4.0.0
  */
 export const ClientMethod = Context.Reference<"query" | "command" | "insert">(
@@ -413,7 +422,7 @@ export const ClientMethod = Context.Reference<"query" | "command" | "insert">(
  * Fiber reference for the ClickHouse `query_id` applied to queries and
  * inserts; a random UUID is generated when no query ID is set.
  *
- * @category references
+ * @category services
  * @since 4.0.0
  */
 export const QueryId = Context.Reference<string | undefined>(
@@ -425,7 +434,7 @@ export const QueryId = Context.Reference<string | undefined>(
  * Fiber reference containing ClickHouse settings to attach to queries,
  * commands, and inserts.
  *
- * @category references
+ * @category services
  * @since 4.0.0
  */
 export const ClickhouseSettings: Context.Reference<
@@ -484,7 +493,7 @@ const typeFromUnknown = (value: unknown): string => {
   }
   switch (typeof value) {
     case "number":
-      return "Decimal"
+      return "Float64"
     case "bigint":
       return "Int64"
     case "boolean":
@@ -504,7 +513,7 @@ const typeFromUnknown = (value: unknown): string => {
  * `{pN: Type}` placeholders and escaping identifiers with an optional query
  * name transform.
  *
- * @category compiler
+ * @category constructors
  * @since 4.0.0
  */
 export const makeCompiler = (transform?: (_: string) => string) =>
@@ -534,13 +543,13 @@ const escape = Statement.defaultEscape("\"")
  * Custom SQL fragment type used for ClickHouse typed parameters created by
  * `ClickhouseClient.param`.
  *
- * @category custom types
+ * @category models
  * @since 4.0.0
  */
 export type ClickhouseCustom = ClickhouseParam
 
 /**
- * @category custom types
+ * @category models
  * @since 4.0.0
  */
 interface ClickhouseParam extends Statement.Custom<"ClickhouseParam", string, unknown> {}

package/src/ClickhouseMigrator.ts

@@ -24,7 +24,7 @@ export * from "effect/unstable/sql/Migrator"
  * Runs SQL migrations for ClickHouse using the supplied migrator options and
  * returns the applied migration IDs and names.
  *
- * @category constructors
+ * @category running
  * @since 4.0.0
  */
 export const run: <R2 = never>(