@effect/sql-clickhouse 0.5.12 → 0.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/ClickhouseClient.js +13 -17
- package/dist/cjs/ClickhouseClient.js.map +1 -1
- package/dist/dts/ClickhouseClient.d.ts +2 -1
- package/dist/dts/ClickhouseClient.d.ts.map +1 -1
- package/dist/esm/ClickhouseClient.js +14 -18
- package/dist/esm/ClickhouseClient.js.map +1 -1
- package/package.json +4 -4
- package/src/ClickhouseClient.ts +24 -20
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.makeCompiler = exports.make = exports.layerConfig = exports.layer = exports.currentQueryId = exports.currentClientMethod = exports.currentClickhouseSettings = exports.TypeId = exports.ClickhouseClient = void 0;
|
|
7
7
|
var Clickhouse = _interopRequireWildcard(require("@clickhouse/client"));
|
|
8
|
+
var Reactivity = _interopRequireWildcard(require("@effect/experimental/Reactivity"));
|
|
8
9
|
var NodeStream = _interopRequireWildcard(require("@effect/platform-node/NodeStream"));
|
|
9
10
|
var Client = _interopRequireWildcard(require("@effect/sql/SqlClient"));
|
|
10
11
|
var _SqlError = require("@effect/sql/SqlError");
|
|
@@ -42,7 +43,7 @@ const ClickhouseClient = exports.ClickhouseClient = /*#__PURE__*/Context.Generic
|
|
|
42
43
|
*/
|
|
43
44
|
const make = options => Effect.gen(function* (_) {
|
|
44
45
|
const compiler = makeCompiler(options.transformQueryNames);
|
|
45
|
-
const transformRows = options.transformResultNames ? Statement.defaultTransforms(options.transformResultNames).array :
|
|
46
|
+
const transformRows = options.transformResultNames ? Statement.defaultTransforms(options.transformResultNames).array : undefined;
|
|
46
47
|
const client = Clickhouse.createClient(options);
|
|
47
48
|
yield* Effect.acquireRelease(Effect.tryPromise({
|
|
48
49
|
try: () => client.exec({
|
|
@@ -110,25 +111,19 @@ const make = options => Effect.gen(function* (_) {
|
|
|
110
111
|
return Effect.succeed([]);
|
|
111
112
|
}));
|
|
112
113
|
}
|
|
113
|
-
|
|
114
|
-
return
|
|
115
|
-
}
|
|
116
|
-
execute(sql, params) {
|
|
117
|
-
return this.runTransform(sql, params);
|
|
114
|
+
execute(sql, params, transformRows) {
|
|
115
|
+
return transformRows ? Effect.map(this.run(sql, params), transformRows) : this.run(sql, params);
|
|
118
116
|
}
|
|
119
117
|
executeRaw(sql, params) {
|
|
120
118
|
return this.runRaw(sql, params);
|
|
121
119
|
}
|
|
122
|
-
executeWithoutTransform(sql, params) {
|
|
123
|
-
return this.run(sql, params);
|
|
124
|
-
}
|
|
125
120
|
executeValues(sql, params) {
|
|
126
121
|
return this.run(sql, params, "JSONCompact");
|
|
127
122
|
}
|
|
128
|
-
executeUnprepared(sql, params) {
|
|
129
|
-
return this.
|
|
123
|
+
executeUnprepared(sql, params, transformRows) {
|
|
124
|
+
return this.execute(sql, params, transformRows);
|
|
130
125
|
}
|
|
131
|
-
executeStream(sql, params) {
|
|
126
|
+
executeStream(sql, params, transformRows) {
|
|
132
127
|
return this.runRaw(sql, params, "JSONEachRow").pipe(Effect.map(result => {
|
|
133
128
|
if (!("stream" in result)) {
|
|
134
129
|
return Stream.empty;
|
|
@@ -145,7 +140,7 @@ const make = options => Effect.gen(function* (_) {
|
|
|
145
140
|
}
|
|
146
141
|
}
|
|
147
142
|
return Effect.tryPromise({
|
|
148
|
-
try: () => Promise.all(promises).then(rows => Chunk.unsafeFromArray(transformRows(rows))),
|
|
143
|
+
try: () => Promise.all(promises).then(rows => Chunk.unsafeFromArray(transformRows ? transformRows(rows) : rows)),
|
|
149
144
|
catch: cause => new _SqlError.SqlError({
|
|
150
145
|
cause,
|
|
151
146
|
message: "Failed to parse row"
|
|
@@ -155,11 +150,12 @@ const make = options => Effect.gen(function* (_) {
|
|
|
155
150
|
}
|
|
156
151
|
}
|
|
157
152
|
const connection = new ConnectionImpl(client);
|
|
158
|
-
return Object.assign(Client.make({
|
|
153
|
+
return Object.assign(yield* Client.make({
|
|
159
154
|
acquirer: Effect.succeed(connection),
|
|
160
155
|
compiler,
|
|
161
156
|
spanAttributes: [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [Otel.SEMATTRS_DB_SYSTEM, "clickhouse"], [Otel.SEMATTRS_DB_NAME, options.database ?? "default"]],
|
|
162
|
-
beginTransaction: "BEGIN TRANSACTION"
|
|
157
|
+
beginTransaction: "BEGIN TRANSACTION",
|
|
158
|
+
transformRows
|
|
163
159
|
}), {
|
|
164
160
|
[TypeId]: TypeId,
|
|
165
161
|
config: options,
|
|
@@ -216,13 +212,13 @@ const currentClickhouseSettings = exports.currentClickhouseSettings = /*#__PURE_
|
|
|
216
212
|
* @category layers
|
|
217
213
|
* @since 1.0.0
|
|
218
214
|
*/
|
|
219
|
-
const layerConfig = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client)))));
|
|
215
|
+
const layerConfig = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client))))).pipe(Layer.provide(Reactivity.layer));
|
|
220
216
|
/**
|
|
221
217
|
* @category layers
|
|
222
218
|
* @since 1.0.0
|
|
223
219
|
*/
|
|
224
220
|
exports.layerConfig = layerConfig;
|
|
225
|
-
const layer = config => Layer.scopedContext(Effect.map(make(config), client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client))));
|
|
221
|
+
const layer = config => Layer.scopedContext(Effect.map(make(config), client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client)))).pipe(Layer.provide(Reactivity.layer));
|
|
226
222
|
exports.layer = layer;
|
|
227
223
|
const typeFromUnknown = value => {
|
|
228
224
|
if (Statement.isFragment(value)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClickhouseClient.js","names":["Clickhouse","_interopRequireWildcard","require","NodeStream","Client","_SqlError","Statement","Otel","Chunk","Config","Context","Effect","FiberRef","_Function","_GlobalValue","Layer","Stream","Crypto","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","ClickhouseClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","identity","client","createClient","acquireRelease","tryPromise","try","exec","query","catch","cause","SqlError","message","promise","close","ConnectionImpl","conn","constructor","runRaw","sql","params","format","paramsObj","length","withFiberRuntime","fiber","method","getFiberRef","currentClientMethod","async","resume","queryId","currentQueryId","randomUUID","settings","currentClickhouseSettings","controller","AbortController","command","query_params","abort_signal","signal","query_id","clickhouse_settings","then","result","succeed","fail","suspend","abort","run","pipe","flatMap","json","data","runTransform","map","execute","executeRaw","executeWithoutTransform","executeValues","executeUnprepared","executeStream","empty","fromReadable","stream","unwrap","chunks","mapEffect","chunk","promises","rows","row","push","Promise","all","unsafeFromArray","flattenChunks","connection","assign","acquirer","spanAttributes","entries","SEMATTRS_DB_SYSTEM","SEMATTRS_DB_NAME","database","beginTransaction","config","param","dataType","value","clickhouseParam","asCommand","effect","locally","insertQuery","insert","withQueryId","dual","withClickhouseSettings","globalValue","unsafeMake","undefined","layerConfig","scopedContext","add","SqlClient","layer","typeFromUnknown","isFragment","segments","isClickhouseParam","i0","Array","isArray","Date","transform","dialect","placeholder","onIdentifier","withoutTransform","escape","onRecordUpdate","onCustom","type","i1","defaultEscape","custom","isCustom"],"sources":["../../src/ClickhouseClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"ClickhouseClient.js","names":["Clickhouse","_interopRequireWildcard","require","Reactivity","NodeStream","Client","_SqlError","Statement","Otel","Chunk","Config","Context","Effect","FiberRef","_Function","_GlobalValue","Layer","Stream","Crypto","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","ClickhouseClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","client","createClient","acquireRelease","tryPromise","try","exec","query","catch","cause","SqlError","message","promise","close","ConnectionImpl","conn","constructor","runRaw","sql","params","format","paramsObj","length","withFiberRuntime","fiber","method","getFiberRef","currentClientMethod","async","resume","queryId","currentQueryId","randomUUID","settings","currentClickhouseSettings","controller","AbortController","command","query_params","abort_signal","signal","query_id","clickhouse_settings","then","result","succeed","fail","suspend","abort","run","pipe","flatMap","json","data","execute","map","executeRaw","executeValues","executeUnprepared","executeStream","empty","fromReadable","stream","unwrap","chunks","mapEffect","chunk","promises","rows","row","push","Promise","all","unsafeFromArray","flattenChunks","connection","assign","acquirer","spanAttributes","entries","SEMATTRS_DB_SYSTEM","SEMATTRS_DB_NAME","database","beginTransaction","config","param","dataType","value","clickhouseParam","asCommand","effect","locally","insertQuery","insert","withQueryId","dual","withClickhouseSettings","globalValue","unsafeMake","layerConfig","scopedContext","add","SqlClient","provide","layer","typeFromUnknown","isFragment","segments","isClickhouseParam","i0","Array","isArray","Date","transform","dialect","placeholder","onIdentifier","withoutTransform","escape","onRecordUpdate","onCustom","type","i1","defaultEscape","custom","isCustom"],"sources":["../../src/ClickhouseClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
4
|
import * as Clickhouse from "@clickhouse/client";
|
|
5
|
+
import * as Reactivity from "@effect/experimental/Reactivity";
|
|
5
6
|
import * as Client from "@effect/sql/SqlClient";
|
|
6
7
|
import { SqlError } from "@effect/sql/SqlError";
|
|
7
8
|
import * as Statement from "@effect/sql/Statement";
|
|
@@ -64,7 +65,7 @@ export interface ClickhouseClientConfig extends Clickhouse.ClickHouseClientConfi
|
|
|
64
65
|
* @category constructors
|
|
65
66
|
* @since 1.0.0
|
|
66
67
|
*/
|
|
67
|
-
export declare const make: (options: ClickhouseClientConfig) => Effect.Effect<ClickhouseClient, SqlError, Scope.Scope>;
|
|
68
|
+
export declare const make: (options: ClickhouseClientConfig) => Effect.Effect<ClickhouseClient, SqlError, Scope.Scope | Reactivity.Reactivity>;
|
|
68
69
|
/**
|
|
69
70
|
* @category fiber refs
|
|
70
71
|
* @since 1.0.0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClickhouseClient.d.ts","sourceRoot":"","sources":["../../src/ClickhouseClient.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"ClickhouseClient.d.ts","sourceRoot":"","sources":["../../src/ClickhouseClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
4
|
import * as Clickhouse from "@clickhouse/client";
|
|
5
|
+
import * as Reactivity from "@effect/experimental/Reactivity";
|
|
5
6
|
import * as NodeStream from "@effect/platform-node/NodeStream";
|
|
6
7
|
import * as Client from "@effect/sql/SqlClient";
|
|
7
8
|
import { SqlError } from "@effect/sql/SqlError";
|
|
@@ -12,7 +13,7 @@ import * as Config from "effect/Config";
|
|
|
12
13
|
import * as Context from "effect/Context";
|
|
13
14
|
import * as Effect from "effect/Effect";
|
|
14
15
|
import * as FiberRef from "effect/FiberRef";
|
|
15
|
-
import { dual
|
|
16
|
+
import { dual } from "effect/Function";
|
|
16
17
|
import { globalValue } from "effect/GlobalValue";
|
|
17
18
|
import * as Layer from "effect/Layer";
|
|
18
19
|
import * as Stream from "effect/Stream";
|
|
@@ -33,7 +34,7 @@ export const ClickhouseClient = /*#__PURE__*/Context.GenericTag("@effect/sql-cli
|
|
|
33
34
|
*/
|
|
34
35
|
export const make = options => Effect.gen(function* (_) {
|
|
35
36
|
const compiler = makeCompiler(options.transformQueryNames);
|
|
36
|
-
const transformRows = options.transformResultNames ? Statement.defaultTransforms(options.transformResultNames).array :
|
|
37
|
+
const transformRows = options.transformResultNames ? Statement.defaultTransforms(options.transformResultNames).array : undefined;
|
|
37
38
|
const client = Clickhouse.createClient(options);
|
|
38
39
|
yield* Effect.acquireRelease(Effect.tryPromise({
|
|
39
40
|
try: () => client.exec({
|
|
@@ -101,25 +102,19 @@ export const make = options => Effect.gen(function* (_) {
|
|
|
101
102
|
return Effect.succeed([]);
|
|
102
103
|
}));
|
|
103
104
|
}
|
|
104
|
-
|
|
105
|
-
return
|
|
106
|
-
}
|
|
107
|
-
execute(sql, params) {
|
|
108
|
-
return this.runTransform(sql, params);
|
|
105
|
+
execute(sql, params, transformRows) {
|
|
106
|
+
return transformRows ? Effect.map(this.run(sql, params), transformRows) : this.run(sql, params);
|
|
109
107
|
}
|
|
110
108
|
executeRaw(sql, params) {
|
|
111
109
|
return this.runRaw(sql, params);
|
|
112
110
|
}
|
|
113
|
-
executeWithoutTransform(sql, params) {
|
|
114
|
-
return this.run(sql, params);
|
|
115
|
-
}
|
|
116
111
|
executeValues(sql, params) {
|
|
117
112
|
return this.run(sql, params, "JSONCompact");
|
|
118
113
|
}
|
|
119
|
-
executeUnprepared(sql, params) {
|
|
120
|
-
return this.
|
|
114
|
+
executeUnprepared(sql, params, transformRows) {
|
|
115
|
+
return this.execute(sql, params, transformRows);
|
|
121
116
|
}
|
|
122
|
-
executeStream(sql, params) {
|
|
117
|
+
executeStream(sql, params, transformRows) {
|
|
123
118
|
return this.runRaw(sql, params, "JSONEachRow").pipe(Effect.map(result => {
|
|
124
119
|
if (!("stream" in result)) {
|
|
125
120
|
return Stream.empty;
|
|
@@ -136,7 +131,7 @@ export const make = options => Effect.gen(function* (_) {
|
|
|
136
131
|
}
|
|
137
132
|
}
|
|
138
133
|
return Effect.tryPromise({
|
|
139
|
-
try: () => Promise.all(promises).then(rows => Chunk.unsafeFromArray(transformRows(rows))),
|
|
134
|
+
try: () => Promise.all(promises).then(rows => Chunk.unsafeFromArray(transformRows ? transformRows(rows) : rows)),
|
|
140
135
|
catch: cause => new SqlError({
|
|
141
136
|
cause,
|
|
142
137
|
message: "Failed to parse row"
|
|
@@ -146,11 +141,12 @@ export const make = options => Effect.gen(function* (_) {
|
|
|
146
141
|
}
|
|
147
142
|
}
|
|
148
143
|
const connection = new ConnectionImpl(client);
|
|
149
|
-
return Object.assign(Client.make({
|
|
144
|
+
return Object.assign(yield* Client.make({
|
|
150
145
|
acquirer: Effect.succeed(connection),
|
|
151
146
|
compiler,
|
|
152
147
|
spanAttributes: [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [Otel.SEMATTRS_DB_SYSTEM, "clickhouse"], [Otel.SEMATTRS_DB_NAME, options.database ?? "default"]],
|
|
153
|
-
beginTransaction: "BEGIN TRANSACTION"
|
|
148
|
+
beginTransaction: "BEGIN TRANSACTION",
|
|
149
|
+
transformRows
|
|
154
150
|
}), {
|
|
155
151
|
[TypeId]: TypeId,
|
|
156
152
|
config: options,
|
|
@@ -206,12 +202,12 @@ export const currentClickhouseSettings = /*#__PURE__*/globalValue("@effect/sql-c
|
|
|
206
202
|
* @category layers
|
|
207
203
|
* @since 1.0.0
|
|
208
204
|
*/
|
|
209
|
-
export const layerConfig = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client)))));
|
|
205
|
+
export const layerConfig = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client))))).pipe(Layer.provide(Reactivity.layer));
|
|
210
206
|
/**
|
|
211
207
|
* @category layers
|
|
212
208
|
* @since 1.0.0
|
|
213
209
|
*/
|
|
214
|
-
export const layer = config => Layer.scopedContext(Effect.map(make(config), client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client))));
|
|
210
|
+
export const layer = config => Layer.scopedContext(Effect.map(make(config), client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client)))).pipe(Layer.provide(Reactivity.layer));
|
|
215
211
|
const typeFromUnknown = value => {
|
|
216
212
|
if (Statement.isFragment(value)) {
|
|
217
213
|
return typeFromUnknown(value.segments[0]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClickhouseClient.js","names":["Clickhouse","NodeStream","Client","SqlError","Statement","Otel","Chunk","Config","Context","Effect","FiberRef","dual","identity","globalValue","Layer","Stream","Crypto","TypeId","Symbol","for","ClickhouseClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","client","createClient","acquireRelease","tryPromise","try","exec","query","catch","cause","message","promise","close","ConnectionImpl","conn","constructor","runRaw","sql","params","format","paramsObj","i","length","withFiberRuntime","fiber","method","getFiberRef","currentClientMethod","async","resume","queryId","currentQueryId","randomUUID","settings","currentClickhouseSettings","controller","AbortController","command","query_params","abort_signal","signal","query_id","clickhouse_settings","then","result","succeed","fail","suspend","abort","run","pipe","flatMap","json","data","runTransform","map","execute","executeRaw","executeWithoutTransform","executeValues","executeUnprepared","executeStream","empty","fromReadable","stream","unwrap","chunks","mapEffect","chunk","promises","rows","row","push","Promise","all","unsafeFromArray","flattenChunks","connection","Object","assign","acquirer","spanAttributes","entries","SEMATTRS_DB_SYSTEM","SEMATTRS_DB_NAME","database","beginTransaction","config","param","dataType","value","clickhouseParam","asCommand","effect","locally","insertQuery","insert","withQueryId","withClickhouseSettings","unsafeMake","undefined","layerConfig","scopedContext","add","SqlClient","layer","typeFromUnknown","isFragment","segments","isClickhouseParam","i0","Array","isArray","Date","transform","dialect","placeholder","u","onIdentifier","withoutTransform","escape","onRecordUpdate","onCustom","type","i1","defaultEscape","custom","isCustom"],"sources":["../../src/ClickhouseClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"ClickhouseClient.js","names":["Clickhouse","Reactivity","NodeStream","Client","SqlError","Statement","Otel","Chunk","Config","Context","Effect","FiberRef","dual","globalValue","Layer","Stream","Crypto","TypeId","Symbol","for","ClickhouseClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","client","createClient","acquireRelease","tryPromise","try","exec","query","catch","cause","message","promise","close","ConnectionImpl","conn","constructor","runRaw","sql","params","format","paramsObj","i","length","withFiberRuntime","fiber","method","getFiberRef","currentClientMethod","async","resume","queryId","currentQueryId","randomUUID","settings","currentClickhouseSettings","controller","AbortController","command","query_params","abort_signal","signal","query_id","clickhouse_settings","then","result","succeed","fail","suspend","abort","run","pipe","flatMap","json","data","execute","map","executeRaw","executeValues","executeUnprepared","executeStream","empty","fromReadable","stream","unwrap","chunks","mapEffect","chunk","promises","rows","row","push","Promise","all","unsafeFromArray","flattenChunks","connection","Object","assign","acquirer","spanAttributes","entries","SEMATTRS_DB_SYSTEM","SEMATTRS_DB_NAME","database","beginTransaction","config","param","dataType","value","clickhouseParam","asCommand","effect","locally","insertQuery","insert","withQueryId","withClickhouseSettings","unsafeMake","layerConfig","scopedContext","add","SqlClient","provide","layer","typeFromUnknown","isFragment","segments","isClickhouseParam","i0","Array","isArray","Date","transform","dialect","placeholder","u","onIdentifier","withoutTransform","escape","onRecordUpdate","onCustom","type","i1","defaultEscape","custom","isCustom"],"sources":["../../src/ClickhouseClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/sql-clickhouse",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.1",
|
|
4
4
|
"description": "A Clickhouse toolkit for Effect",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
"@opentelemetry/semantic-conventions": "^1.25.1"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@effect/platform": "^0.69.
|
|
18
|
-
"@effect/platform-node": "^0.64.
|
|
19
|
-
"@effect/sql": "^0.
|
|
17
|
+
"@effect/platform": "^0.69.30",
|
|
18
|
+
"@effect/platform-node": "^0.64.32",
|
|
19
|
+
"@effect/sql": "^0.21.1",
|
|
20
20
|
"effect": "^3.10.19"
|
|
21
21
|
},
|
|
22
22
|
"publishConfig": {
|
package/src/ClickhouseClient.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
4
|
import * as Clickhouse from "@clickhouse/client"
|
|
5
|
+
import * as Reactivity from "@effect/experimental/Reactivity"
|
|
5
6
|
import * as NodeStream from "@effect/platform-node/NodeStream"
|
|
6
7
|
import * as Client from "@effect/sql/SqlClient"
|
|
7
8
|
import type { Connection } from "@effect/sql/SqlConnection"
|
|
@@ -15,7 +16,7 @@ import type { ConfigError } from "effect/ConfigError"
|
|
|
15
16
|
import * as Context from "effect/Context"
|
|
16
17
|
import * as Effect from "effect/Effect"
|
|
17
18
|
import * as FiberRef from "effect/FiberRef"
|
|
18
|
-
import { dual
|
|
19
|
+
import { dual } from "effect/Function"
|
|
19
20
|
import { globalValue } from "effect/GlobalValue"
|
|
20
21
|
import * as Layer from "effect/Layer"
|
|
21
22
|
import type * as Scope from "effect/Scope"
|
|
@@ -86,12 +87,12 @@ export interface ClickhouseClientConfig extends Clickhouse.ClickHouseClientConfi
|
|
|
86
87
|
*/
|
|
87
88
|
export const make = (
|
|
88
89
|
options: ClickhouseClientConfig
|
|
89
|
-
): Effect.Effect<ClickhouseClient, SqlError, Scope.Scope> =>
|
|
90
|
+
): Effect.Effect<ClickhouseClient, SqlError, Scope.Scope | Reactivity.Reactivity> =>
|
|
90
91
|
Effect.gen(function*(_) {
|
|
91
92
|
const compiler = makeCompiler(options.transformQueryNames)
|
|
92
93
|
const transformRows = options.transformResultNames
|
|
93
94
|
? Statement.defaultTransforms(options.transformResultNames).array
|
|
94
|
-
:
|
|
95
|
+
: undefined
|
|
95
96
|
|
|
96
97
|
const client = Clickhouse.createClient(options)
|
|
97
98
|
|
|
@@ -165,28 +166,29 @@ export const make = (
|
|
|
165
166
|
)
|
|
166
167
|
}
|
|
167
168
|
|
|
168
|
-
|
|
169
|
-
|
|
169
|
+
execute(
|
|
170
|
+
sql: string,
|
|
171
|
+
params: ReadonlyArray<Primitive>,
|
|
172
|
+
transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
|
|
173
|
+
) {
|
|
174
|
+
return transformRows
|
|
170
175
|
? Effect.map(this.run(sql, params), transformRows)
|
|
171
176
|
: this.run(sql, params)
|
|
172
177
|
}
|
|
173
|
-
|
|
174
|
-
execute(sql: string, params: ReadonlyArray<Primitive>) {
|
|
175
|
-
return this.runTransform(sql, params)
|
|
176
|
-
}
|
|
177
178
|
executeRaw(sql: string, params: ReadonlyArray<Primitive>) {
|
|
178
179
|
return this.runRaw(sql, params)
|
|
179
180
|
}
|
|
180
|
-
executeWithoutTransform(sql: string, params: ReadonlyArray<Primitive>) {
|
|
181
|
-
return this.run(sql, params)
|
|
182
|
-
}
|
|
183
181
|
executeValues(sql: string, params: ReadonlyArray<Primitive>) {
|
|
184
182
|
return this.run(sql, params, "JSONCompact")
|
|
185
183
|
}
|
|
186
|
-
executeUnprepared(sql: string, params
|
|
187
|
-
return this.
|
|
184
|
+
executeUnprepared(sql: string, params: ReadonlyArray<Primitive>, transformRows?: any) {
|
|
185
|
+
return this.execute(sql, params, transformRows)
|
|
188
186
|
}
|
|
189
|
-
executeStream(
|
|
187
|
+
executeStream(
|
|
188
|
+
sql: string,
|
|
189
|
+
params: ReadonlyArray<Primitive>,
|
|
190
|
+
transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
|
|
191
|
+
) {
|
|
190
192
|
return this.runRaw(sql, params, "JSONEachRow").pipe(
|
|
191
193
|
Effect.map((result) => {
|
|
192
194
|
if (!("stream" in result)) {
|
|
@@ -207,7 +209,8 @@ export const make = (
|
|
|
207
209
|
}
|
|
208
210
|
}
|
|
209
211
|
return Effect.tryPromise({
|
|
210
|
-
try: () =>
|
|
212
|
+
try: () =>
|
|
213
|
+
Promise.all(promises).then((rows) => Chunk.unsafeFromArray(transformRows ? transformRows(rows) : rows)),
|
|
211
214
|
catch: (cause) => new SqlError({ cause, message: "Failed to parse row" })
|
|
212
215
|
})
|
|
213
216
|
}),
|
|
@@ -219,7 +222,7 @@ export const make = (
|
|
|
219
222
|
const connection = new ConnectionImpl(client)
|
|
220
223
|
|
|
221
224
|
return Object.assign(
|
|
222
|
-
Client.make({
|
|
225
|
+
yield* Client.make({
|
|
223
226
|
acquirer: Effect.succeed(connection),
|
|
224
227
|
compiler,
|
|
225
228
|
spanAttributes: [
|
|
@@ -227,7 +230,8 @@ export const make = (
|
|
|
227
230
|
[Otel.SEMATTRS_DB_SYSTEM, "clickhouse"],
|
|
228
231
|
[Otel.SEMATTRS_DB_NAME, options.database ?? "default"]
|
|
229
232
|
],
|
|
230
|
-
beginTransaction: "BEGIN TRANSACTION"
|
|
233
|
+
beginTransaction: "BEGIN TRANSACTION",
|
|
234
|
+
transformRows
|
|
231
235
|
}),
|
|
232
236
|
{
|
|
233
237
|
[TypeId]: TypeId as TypeId,
|
|
@@ -324,7 +328,7 @@ export const layerConfig = (
|
|
|
324
328
|
)
|
|
325
329
|
)
|
|
326
330
|
)
|
|
327
|
-
)
|
|
331
|
+
).pipe(Layer.provide(Reactivity.layer))
|
|
328
332
|
|
|
329
333
|
/**
|
|
330
334
|
* @category layers
|
|
@@ -338,7 +342,7 @@ export const layer = (
|
|
|
338
342
|
Context.make(ClickhouseClient, client).pipe(
|
|
339
343
|
Context.add(Client.SqlClient, client)
|
|
340
344
|
))
|
|
341
|
-
)
|
|
345
|
+
).pipe(Layer.provide(Reactivity.layer))
|
|
342
346
|
|
|
343
347
|
const typeFromUnknown = (value: unknown): string => {
|
|
344
348
|
if (Statement.isFragment(value)) {
|