@effect/sql-pg 0.47.0 → 0.49.0

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.
@@ -5,15 +5,21 @@ import * as Reactivity from "@effect/experimental/Reactivity";
5
5
  import * as Client from "@effect/sql/SqlClient";
6
6
  import { SqlError } from "@effect/sql/SqlError";
7
7
  import * as Statement from "@effect/sql/Statement";
8
+ import * as Arr from "effect/Array";
8
9
  import * as Chunk from "effect/Chunk";
9
10
  import * as Config from "effect/Config";
10
11
  import * as Context from "effect/Context";
11
12
  import * as Duration from "effect/Duration";
12
13
  import * as Effect from "effect/Effect";
14
+ import * as Fiber from "effect/Fiber";
13
15
  import * as Layer from "effect/Layer";
16
+ import * as Option from "effect/Option";
17
+ import * as RcRef from "effect/RcRef";
14
18
  import * as Redacted from "effect/Redacted";
19
+ import * as Scope from "effect/Scope";
15
20
  import * as Stream from "effect/Stream";
16
- import postgres from "postgres";
21
+ import * as Pg from "pg";
22
+ import Cursor from "pg-cursor";
17
23
  const ATTR_DB_SYSTEM_NAME = "db.system.name";
18
24
  const ATTR_DB_NAMESPACE = "db.namespace";
19
25
  const ATTR_SERVER_ADDRESS = "server.address";
@@ -22,7 +28,7 @@ const ATTR_SERVER_PORT = "server.port";
22
28
  * @category type ids
23
29
  * @since 1.0.0
24
30
  */
25
- export const TypeId = /*#__PURE__*/Symbol.for("@effect/sql-pg/PgClient");
31
+ export const TypeId = "~@effect/sql-pg/PgClient";
26
32
  /**
27
33
  * @category tags
28
34
  * @since 1.0.0
@@ -35,36 +41,30 @@ export const PgClient = /*#__PURE__*/Context.GenericTag("@effect/sql-pg/PgClient
35
41
  export const make = options => Effect.gen(function* () {
36
42
  const compiler = makeCompiler(options.transformQueryNames, options.transformJson);
37
43
  const transformRows = options.transformResultNames ? Statement.defaultTransforms(options.transformResultNames, options.transformJson).array : undefined;
38
- const opts = {
39
- max: options.maxConnections ?? 10,
40
- max_lifetime: options.connectionTTL ? Math.round(Duration.toMillis(Duration.decode(options.connectionTTL)) / 1000) : undefined,
41
- idle_timeout: options.idleTimeout ? Math.round(Duration.toMillis(Duration.decode(options.idleTimeout)) / 1000) : undefined,
42
- connect_timeout: options.connectTimeout ? Math.round(Duration.toMillis(Duration.decode(options.connectTimeout)) / 1000) : undefined,
44
+ const pool = new Pg.Pool({
45
+ connectionString: options.url ? Redacted.value(options.url) : undefined,
46
+ user: options.username,
43
47
  host: options.host,
44
- port: options.port,
45
- ssl: options.ssl,
46
- path: options.path,
47
48
  database: options.database,
48
- username: options.username,
49
49
  password: options.password ? Redacted.value(options.password) : undefined,
50
- fetch_types: options.fetchTypes ?? true,
51
- prepare: options.prepare ?? true,
52
- onnotice: options.onnotice,
53
- types: options.types,
54
- debug: options.debug,
55
- connection: {
56
- application_name: options.applicationName ?? "@effect/sql-pg"
57
- },
58
- socket: options.socket
59
- };
60
- const client = options.url ? postgres(Redacted.value(options.url), opts) : postgres(opts);
50
+ ssl: options.ssl,
51
+ port: options.port,
52
+ connectionTimeoutMillis: options.connectTimeout ? Duration.toMillis(options.connectTimeout) : undefined,
53
+ idleTimeoutMillis: options.idleTimeout ? Duration.toMillis(options.idleTimeout) : undefined,
54
+ max: options.maxConnections,
55
+ min: options.minConnections,
56
+ maxLifetimeSeconds: options.connectionTTL ? Duration.toSeconds(options.connectionTTL) : undefined,
57
+ application_name: options.applicationName ?? "@effect/sql-pg",
58
+ types: options.types
59
+ });
60
+ pool.on("error", _err => {});
61
61
  yield* Effect.acquireRelease(Effect.tryPromise({
62
- try: () => client`select 1`,
62
+ try: () => pool.query("SELECT 1"),
63
63
  catch: cause => new SqlError({
64
64
  cause,
65
65
  message: "PgClient: Failed to connect"
66
66
  })
67
- }), () => Effect.promise(() => client.end()).pipe(Effect.interruptible, Effect.timeoutOption(1000))).pipe(Effect.timeoutFail({
67
+ }), () => Effect.promise(() => pool.end()).pipe(Effect.interruptible, Effect.timeoutOption(1000))).pipe(Effect.timeoutFail({
68
68
  duration: options.connectTimeout ?? Duration.seconds(5),
69
69
  onTimeout: () => new SqlError({
70
70
  cause: new Error("Connection timed out"),
@@ -76,76 +76,152 @@ export const make = options => Effect.gen(function* () {
76
76
  constructor(pg) {
77
77
  this.pg = pg;
78
78
  }
79
- run(query) {
79
+ run(query, params) {
80
80
  return Effect.async(resume => {
81
- query.then(_ => resume(Effect.succeed(_)), cause => resume(new SqlError({
82
- cause,
83
- message: "Failed to execute statement"
84
- })));
85
- return Effect.sync(() => query.cancel());
81
+ this.pg.query(query, params, (err, result) => {
82
+ if (err) {
83
+ resume(Effect.fail(new SqlError({
84
+ cause: err,
85
+ message: "Failed to execute statement"
86
+ })));
87
+ } else {
88
+ // Multi-statement queries return an array of results
89
+ const rows = Array.isArray(result) ? result.map(r => r.rows ?? []) : result.rows ?? [];
90
+ resume(Effect.succeed(rows));
91
+ }
92
+ });
86
93
  });
87
94
  }
88
95
  execute(sql, params, transformRows) {
89
- return transformRows ? Effect.map(this.run(this.pg.unsafe(sql, params)), transformRows) : this.run(this.pg.unsafe(sql, params));
96
+ return transformRows ? Effect.map(this.run(sql, params), transformRows) : this.run(sql, params);
90
97
  }
91
98
  executeRaw(sql, params) {
92
- return this.run(this.pg.unsafe(sql, params));
99
+ return Effect.async(resume => {
100
+ this.pg.query(sql, params, (err, result) => {
101
+ if (err) {
102
+ resume(Effect.fail(new SqlError({
103
+ cause: err,
104
+ message: "Failed to execute statement"
105
+ })));
106
+ } else {
107
+ resume(Effect.succeed(result));
108
+ }
109
+ });
110
+ });
93
111
  }
94
112
  executeWithoutTransform(sql, params) {
95
- return this.run(this.pg.unsafe(sql, params));
113
+ return this.run(sql, params);
96
114
  }
97
115
  executeValues(sql, params) {
98
- return this.run(this.pg.unsafe(sql, params).values());
116
+ return Effect.async(resume => {
117
+ this.pg.query({
118
+ text: sql,
119
+ rowMode: "array",
120
+ values: params
121
+ }, (err, result) => {
122
+ if (err) {
123
+ resume(Effect.fail(new SqlError({
124
+ cause: err,
125
+ message: "Failed to execute statement"
126
+ })));
127
+ } else {
128
+ resume(Effect.succeed(result.rows));
129
+ }
130
+ });
131
+ });
99
132
  }
100
133
  executeUnprepared(sql, params, transformRows) {
101
134
  return this.execute(sql, params, transformRows);
102
135
  }
103
136
  executeStream(sql, params, transformRows) {
104
- return Stream.mapChunks(Stream.fromAsyncIterable(this.pg.unsafe(sql, params).cursor(16), cause => new SqlError({
105
- cause,
106
- message: "Failed to execute statement"
107
- })), Chunk.flatMap(rows => Chunk.unsafeFromArray(transformRows ? transformRows(rows) : rows)));
137
+ // eslint-disable-next-line @typescript-eslint/no-this-alias
138
+ const self = this;
139
+ return Effect.gen(function* () {
140
+ const cursor = yield* Effect.acquireRelease(Effect.sync(() => self.pg.query(new Cursor(sql, params))), cursor => Effect.sync(() => cursor.close()));
141
+ const pull = Effect.async(resume => {
142
+ cursor.read(128, (err, rows) => {
143
+ if (err) {
144
+ resume(Effect.fail(Option.some(new SqlError({
145
+ cause: err,
146
+ message: "Failed to execute statement"
147
+ }))));
148
+ } else if (Arr.isNonEmptyArray(rows)) {
149
+ resume(Effect.succeed(Chunk.unsafeFromArray(transformRows ? transformRows(rows) : rows)));
150
+ } else {
151
+ resume(Effect.fail(Option.none()));
152
+ }
153
+ });
154
+ });
155
+ return Stream.repeatEffectChunkOption(pull);
156
+ }).pipe(Stream.unwrapScoped);
108
157
  }
109
158
  }
159
+ const reserveRaw = Effect.async(resume => {
160
+ const fiber = Option.getOrThrow(Fiber.getCurrentFiber());
161
+ const scope = Context.unsafeGet(fiber.currentContext, Scope.Scope);
162
+ pool.connect((err, client, release) => {
163
+ if (err) {
164
+ resume(Effect.fail(new SqlError({
165
+ cause: err,
166
+ message: "Failed to acquire connection for transaction"
167
+ })));
168
+ } else {
169
+ resume(Effect.as(Scope.addFinalizer(scope, Effect.sync(release)), client));
170
+ }
171
+ });
172
+ });
173
+ const reserve = Effect.map(reserveRaw, client => new ConnectionImpl(client));
174
+ const listenClient = yield* RcRef.make({
175
+ acquire: reserveRaw
176
+ });
110
177
  return Object.assign(yield* Client.make({
111
- acquirer: Effect.succeed(new ConnectionImpl(client)),
112
- transactionAcquirer: Effect.map(Effect.acquireRelease(Effect.tryPromise({
113
- try: () => client.reserve(),
114
- catch: cause => new SqlError({
115
- cause,
116
- message: "Failed to reserve connection"
117
- })
118
- }), pg => Effect.sync(() => pg.release())), _ => new ConnectionImpl(_)),
178
+ acquirer: Effect.succeed(new ConnectionImpl(pool)),
179
+ transactionAcquirer: reserve,
119
180
  compiler,
120
- spanAttributes: [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [ATTR_DB_SYSTEM_NAME, "postgresql"], [ATTR_DB_NAMESPACE, opts.database ?? options.username ?? "postgres"], [ATTR_SERVER_ADDRESS, opts.host ?? "localhost"], [ATTR_SERVER_PORT, opts.port ?? 5432]],
181
+ spanAttributes: [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [ATTR_DB_SYSTEM_NAME, "postgresql"], [ATTR_DB_NAMESPACE, options.database ?? options.username ?? "postgres"], [ATTR_SERVER_ADDRESS, options.host ?? "localhost"], [ATTR_SERVER_PORT, options.port ?? 5432]],
121
182
  transformRows
122
183
  }), {
123
184
  [TypeId]: TypeId,
124
185
  config: {
125
186
  ...options,
126
- host: client.options.host[0] ?? undefined,
127
- port: client.options.port[0] ?? undefined,
128
- username: client.options.user,
129
- password: client.options.pass ? Redacted.make(client.options.pass) : undefined,
130
- database: client.options.database
187
+ host: pool.options.host,
188
+ port: pool.options.port,
189
+ username: pool.options.user,
190
+ password: typeof pool.options.password === "string" ? Redacted.make(pool.options.password) : undefined,
191
+ database: pool.options.database
131
192
  },
132
193
  json: _ => PgJson(_),
133
- array: _ => PgArray(_),
134
- listen: channel => Stream.asyncPush(emit => Effect.acquireRelease(Effect.tryPromise({
135
- try: () => client.listen(channel, payload => emit.single(payload)),
136
- catch: cause => new SqlError({
137
- cause,
138
- message: "Failed to listen"
139
- })
140
- }), ({
141
- unlisten
142
- }) => Effect.promise(() => unlisten()))),
143
- notify: (channel, payload) => Effect.tryPromise({
144
- try: () => client.notify(channel, payload),
145
- catch: cause => new SqlError({
146
- cause,
147
- message: "Failed to notify"
148
- })
194
+ listen: channel => Stream.asyncPush(Effect.fnUntraced(function* (emit) {
195
+ const client = yield* RcRef.get(listenClient);
196
+ function onNotification(msg) {
197
+ if (msg.channel === channel && msg.payload) {
198
+ emit.single(msg.payload);
199
+ }
200
+ }
201
+ yield* Effect.addFinalizer(() => Effect.promise(() => {
202
+ client.off("notification", onNotification);
203
+ return client.query(`UNLISTEN ${Pg.escapeIdentifier(channel)}`);
204
+ }));
205
+ yield* Effect.tryPromise({
206
+ try: () => client.query(`LISTEN ${Pg.escapeIdentifier(channel)}`),
207
+ catch: cause => new SqlError({
208
+ cause,
209
+ message: "Failed to listen"
210
+ })
211
+ });
212
+ client.on("notification", onNotification);
213
+ })),
214
+ notify: (channel, payload) => Effect.async(resume => {
215
+ pool.query(`NOTIFY ${Pg.escapeIdentifier(channel)}, $1`, [payload], err => {
216
+ if (err) {
217
+ resume(Effect.fail(new SqlError({
218
+ cause: err,
219
+ message: "Failed to notify"
220
+ })));
221
+ } else {
222
+ resume(Effect.void);
223
+ }
224
+ });
149
225
  })
150
226
  });
151
227
  });
@@ -164,9 +240,6 @@ export const layer = config => Layer.scopedContext(Effect.map(make(config), clie
164
240
  * @since 1.0.0
165
241
  */
166
242
  export const makeCompiler = (transform, transformJson = true) => {
167
- const pg = postgres({
168
- max: 0
169
- });
170
243
  const transformValue = transformJson && transform ? Statement.defaultTransforms(transform).value : undefined;
171
244
  return Statement.makeCompiler({
172
245
  dialect: "pg",
@@ -183,30 +256,7 @@ export const makeCompiler = (transform, transformJson = true) => {
183
256
  switch (type.kind) {
184
257
  case "PgJson":
185
258
  {
186
- return [placeholder(undefined), [pg.json(withoutTransform || transformValue === undefined ? type.i0 : transformValue(type.i0))]];
187
- }
188
- case "PgArray":
189
- {
190
- const param = pg.array(type.i0);
191
- const first = type.i0[0];
192
- switch (typeof first) {
193
- case "boolean":
194
- {
195
- param.type = 1000;
196
- break;
197
- }
198
- case "number":
199
- {
200
- param.type = 1022;
201
- break;
202
- }
203
- default:
204
- {
205
- param.type = 1009;
206
- break;
207
- }
208
- }
209
- return [placeholder(undefined), [param]];
259
+ return [placeholder(undefined), [withoutTransform || transformValue === undefined ? type.i0 : transformValue(type.i0)]];
210
260
  }
211
261
  }
212
262
  }
@@ -218,9 +268,4 @@ const escape = /*#__PURE__*/Statement.defaultEscape("\"");
218
268
  * @since 1.0.0
219
269
  */
220
270
  const PgJson = /*#__PURE__*/Statement.custom("PgJson");
221
- /**
222
- * @category custom types
223
- * @since 1.0.0
224
- */
225
- const PgArray = /*#__PURE__*/Statement.custom("PgArray");
226
271
  //# sourceMappingURL=PgClient.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"PgClient.js","names":["Reactivity","Client","SqlError","Statement","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","postgres","ATTR_DB_SYSTEM_NAME","ATTR_DB_NAMESPACE","ATTR_SERVER_ADDRESS","ATTR_SERVER_PORT","TypeId","Symbol","for","PgClient","GenericTag","make","options","gen","compiler","makeCompiler","transformQueryNames","transformJson","transformRows","transformResultNames","defaultTransforms","array","undefined","opts","max","maxConnections","max_lifetime","connectionTTL","Math","round","toMillis","decode","idle_timeout","idleTimeout","connect_timeout","connectTimeout","host","port","ssl","path","database","username","password","value","fetch_types","fetchTypes","prepare","onnotice","types","debug","connection","application_name","applicationName","socket","client","url","acquireRelease","tryPromise","try","catch","cause","message","promise","end","pipe","interruptible","timeoutOption","timeoutFail","duration","seconds","onTimeout","Error","ConnectionImpl","pg","constructor","run","query","async","resume","then","_","succeed","sync","cancel","execute","sql","params","map","unsafe","executeRaw","executeWithoutTransform","executeValues","values","executeUnprepared","executeStream","mapChunks","fromAsyncIterable","cursor","flatMap","rows","unsafeFromArray","Object","assign","acquirer","transactionAcquirer","reserve","release","spanAttributes","entries","config","user","pass","json","PgJson","PgArray","listen","channel","asyncPush","emit","payload","single","unlisten","notify","layerConfig","scopedContext","unwrap","add","SqlClient","provide","layer","transform","transformValue","dialect","placeholder","onIdentifier","withoutTransform","escape","onRecordUpdate","placeholders","valueAlias","valueColumns","returning","flat","concat","onCustom","type","kind","i0","param","first","defaultEscape","custom"],"sources":["../../src/PgClient.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,UAAU,MAAM,iCAAiC;AAC7D,OAAO,KAAKC,MAAM,MAAM,uBAAuB;AAE/C,SAASC,QAAQ,QAAQ,sBAAsB;AAE/C,OAAO,KAAKC,SAAS,MAAM,uBAAuB;AAClD,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAGvC,OAAOC,QAAQ,MAAM,UAAU;AAE/B,MAAMC,mBAAmB,GAAG,gBAAgB;AAC5C,MAAMC,iBAAiB,GAAG,cAAc;AACxC,MAAMC,mBAAmB,GAAG,gBAAgB;AAC5C,MAAMC,gBAAgB,GAAG,aAAa;AAEtC;;;;AAIA,OAAO,MAAMC,MAAM,gBAAkBC,MAAM,CAACC,GAAG,CAAC,yBAAyB,CAAC;AAqB1E;;;;AAIA,OAAO,MAAMC,QAAQ,gBAAGd,OAAO,CAACe,UAAU,CAAW,yBAAyB,CAAC;AA+E/E;;;;AAIA,OAAO,MAAMC,IAAI,GACfC,OAAuB,IAEvBf,MAAM,CAACgB,GAAG,CAAC,aAAS;EAClB,MAAMC,QAAQ,GAAGC,YAAY,CAC3BH,OAAO,CAACI,mBAAmB,EAC3BJ,OAAO,CAACK,aAAa,CACtB;EACD,MAAMC,aAAa,GAAGN,OAAO,CAACO,oBAAoB,GAChD3B,SAAS,CAAC4B,iBAAiB,CACzBR,OAAO,CAACO,oBAAoB,EAC5BP,OAAO,CAACK,aAAa,CACtB,CAACI,KAAK,GACPC,SAAS;EAEX,MAAMC,IAAI,GAA0C;IAClDC,GAAG,EAAEZ,OAAO,CAACa,cAAc,IAAI,EAAE;IACjCC,YAAY,EAAEd,OAAO,CAACe,aAAa,GAC/BC,IAAI,CAACC,KAAK,CACVjC,QAAQ,CAACkC,QAAQ,CAAClC,QAAQ,CAACmC,MAAM,CAACnB,OAAO,CAACe,aAAa,CAAC,CAAC,GAAG,IAAI,CACjE,GACCL,SAAS;IACbU,YAAY,EAAEpB,OAAO,CAACqB,WAAW,GAC7BL,IAAI,CAACC,KAAK,CACVjC,QAAQ,CAACkC,QAAQ,CAAClC,QAAQ,CAACmC,MAAM,CAACnB,OAAO,CAACqB,WAAW,CAAC,CAAC,GAAG,IAAI,CAC/D,GACCX,SAAS;IACbY,eAAe,EAAEtB,OAAO,CAACuB,cAAc,GACnCP,IAAI,CAACC,KAAK,CACVjC,QAAQ,CAACkC,QAAQ,CAAClC,QAAQ,CAACmC,MAAM,CAACnB,OAAO,CAACuB,cAAc,CAAC,CAAC,GAAG,IAAI,CAClE,GACCb,SAAS;IAEbc,IAAI,EAAExB,OAAO,CAACwB,IAAI;IAClBC,IAAI,EAAEzB,OAAO,CAACyB,IAAI;IAClBC,GAAG,EAAE1B,OAAO,CAAC0B,GAAG;IAChBC,IAAI,EAAE3B,OAAO,CAAC2B,IAAI;IAClBC,QAAQ,EAAE5B,OAAO,CAAC4B,QAAQ;IAC1BC,QAAQ,EAAE7B,OAAO,CAAC6B,QAAQ;IAC1BC,QAAQ,EAAE9B,OAAO,CAAC8B,QAAQ,GAAG3C,QAAQ,CAAC4C,KAAK,CAAC/B,OAAO,CAAC8B,QAAQ,CAAC,GAAGpB,SAAS;IACzEsB,WAAW,EAAEhC,OAAO,CAACiC,UAAU,IAAI,IAAI;IACvCC,OAAO,EAAElC,OAAO,CAACkC,OAAO,IAAI,IAAI;IAChCC,QAAQ,EAAEnC,OAAO,CAACmC,QAAQ;IAC1BC,KAAK,EAAEpC,OAAO,CAACoC,KAAK;IACpBC,KAAK,EAAErC,OAAO,CAACqC,KAAK;IACpBC,UAAU,EAAE;MACVC,gBAAgB,EAAEvC,OAAO,CAACwC,eAAe,IAAI;KAC9C;IACDC,MAAM,EAAEzC,OAAO,CAACyC;GACjB;EAED,MAAMC,MAAM,GAAG1C,OAAO,CAAC2C,GAAG,GACtBtD,QAAQ,CAACF,QAAQ,CAAC4C,KAAK,CAAC/B,OAAO,CAAC2C,GAAG,CAAC,EAAEhC,IAAW,CAAC,GAClDtB,QAAQ,CAACsB,IAAW,CAAC;EAEzB,OAAO1B,MAAM,CAAC2D,cAAc,CAC1B3D,MAAM,CAAC4D,UAAU,CAAC;IAChBC,GAAG,EAAEA,CAAA,KAAMJ,MAAM,UAAU;IAC3BK,KAAK,EAAGC,KAAK,IAAK,IAAIrE,QAAQ,CAAC;MAAEqE,KAAK;MAAEC,OAAO,EAAE;IAA6B,CAAE;GACjF,CAAC,EACF,MACEhE,MAAM,CAACiE,OAAO,CAAC,MAAMR,MAAM,CAACS,GAAG,EAAE,CAAC,CAACC,IAAI,CACrCnE,MAAM,CAACoE,aAAa,EACpBpE,MAAM,CAACqE,aAAa,CAAC,IAAI,CAAC,CAC3B,CACJ,CAACF,IAAI,CACJnE,MAAM,CAACsE,WAAW,CAAC;IACjBC,QAAQ,EAAExD,OAAO,CAACuB,cAAc,IAAIvC,QAAQ,CAACyE,OAAO,CAAC,CAAC,CAAC;IACvDC,SAAS,EAAEA,CAAA,KACT,IAAI/E,QAAQ,CAAC;MACXqE,KAAK,EAAE,IAAIW,KAAK,CAAC,sBAAsB,CAAC;MACxCV,OAAO,EAAE;KACV;GACJ,CAAC,CACH;EAED,MAAMW,cAAc;IACWC,EAAA;IAA7BC,YAA6BD,EAAoB;MAApB,KAAAA,EAAE,GAAFA,EAAE;IAAqB;IAE5CE,GAAGA,CAACC,KAAoE;MAC9E,OAAO/E,MAAM,CAACgF,KAAK,CAAgCC,MAAM,IAAI;QAC3DF,KAAK,CAACG,IAAI,CACPC,CAAC,IAAKF,MAAM,CAACjF,MAAM,CAACoF,OAAO,CAACD,CAAC,CAAC,CAAC,EAC/BpB,KAAK,IAAKkB,MAAM,CAAC,IAAIvF,QAAQ,CAAC;UAAEqE,KAAK;UAAEC,OAAO,EAAE;QAA6B,CAAE,CAAC,CAAC,CACnF;QACD,OAAOhE,MAAM,CAACqF,IAAI,CAAC,MAAMN,KAAK,CAACO,MAAM,EAAE,CAAC;MAC1C,CAAC,CAAC;IACJ;IAEAC,OAAOA,CACLC,GAAW,EACXC,MAAgC,EAChCpE,aAA0F;MAE1F,OAAOA,aAAa,GAChBrB,MAAM,CAAC0F,GAAG,CAAC,IAAI,CAACZ,GAAG,CAAC,IAAI,CAACF,EAAE,CAACe,MAAM,CAACH,GAAG,EAAEC,MAAa,CAAC,CAAC,EAAEpE,aAAa,CAAC,GACvE,IAAI,CAACyD,GAAG,CAAC,IAAI,CAACF,EAAE,CAACe,MAAM,CAACH,GAAG,EAAEC,MAAa,CAAC,CAAC;IAClD;IACAG,UAAUA,CAACJ,GAAW,EAAEC,MAAgC;MACtD,OAAO,IAAI,CAACX,GAAG,CAAC,IAAI,CAACF,EAAE,CAACe,MAAM,CAACH,GAAG,EAAEC,MAAa,CAAC,CAAC;IACrD;IACAI,uBAAuBA,CAACL,GAAW,EAAEC,MAAgC;MACnE,OAAO,IAAI,CAACX,GAAG,CAAC,IAAI,CAACF,EAAE,CAACe,MAAM,CAACH,GAAG,EAAEC,MAAa,CAAC,CAAC;IACrD;IACAK,aAAaA,CAACN,GAAW,EAAEC,MAAgC;MACzD,OAAO,IAAI,CAACX,GAAG,CAAC,IAAI,CAACF,EAAE,CAACe,MAAM,CAACH,GAAG,EAAEC,MAAa,CAAC,CAACM,MAAM,EAAE,CAAC;IAC9D;IACAC,iBAAiBA,CACfR,GAAW,EACXC,MAAgC,EAChCpE,aAA0F;MAE1F,OAAO,IAAI,CAACkE,OAAO,CAACC,GAAG,EAAEC,MAAM,EAAEpE,aAAa,CAAC;IACjD;IACA4E,aAAaA,CACXT,GAAW,EACXC,MAAgC,EAChCpE,aAA0F;MAE1F,OAAOlB,MAAM,CAAC+F,SAAS,CACrB/F,MAAM,CAACgG,iBAAiB,CACtB,IAAI,CAACvB,EAAE,CAACe,MAAM,CAACH,GAAG,EAAEC,MAAa,CAAC,CAACW,MAAM,CAAC,EAAE,CAE3C,EACArC,KAAK,IAAK,IAAIrE,QAAQ,CAAC;QAAEqE,KAAK;QAAEC,OAAO,EAAE;MAA6B,CAAE,CAAC,CAC3E,EACDpE,KAAK,CAACyG,OAAO,CAAEC,IAAI,IAAK1G,KAAK,CAAC2G,eAAe,CAAClF,aAAa,GAAGA,aAAa,CAACiF,IAAI,CAAC,GAAGA,IAAI,CAAC,CAAC,CAC3F;IACH;;EAGF,OAAOE,MAAM,CAACC,MAAM,CAClB,OAAOhH,MAAM,CAACqB,IAAI,CAAC;IACjB4F,QAAQ,EAAE1G,MAAM,CAACoF,OAAO,CAAC,IAAIT,cAAc,CAAClB,MAAM,CAAC,CAAC;IACpDkD,mBAAmB,EAAE3G,MAAM,CAAC0F,GAAG,CAC7B1F,MAAM,CAAC2D,cAAc,CACnB3D,MAAM,CAAC4D,UAAU,CAAC;MAChBC,GAAG,EAAEA,CAAA,KAAMJ,MAAM,CAACmD,OAAO,EAAE;MAC3B9C,KAAK,EAAGC,KAAK,IAAK,IAAIrE,QAAQ,CAAC;QAAEqE,KAAK;QAAEC,OAAO,EAAE;MAA8B,CAAE;KAClF,CAAC,EACDY,EAAE,IAAK5E,MAAM,CAACqF,IAAI,CAAC,MAAMT,EAAE,CAACiC,OAAO,EAAE,CAAC,CACxC,EACA1B,CAAC,IAAK,IAAIR,cAAc,CAACQ,CAAC,CAAC,CAC7B;IACDlE,QAAQ;IACR6F,cAAc,EAAE,CACd,IAAI/F,OAAO,CAAC+F,cAAc,GAAGN,MAAM,CAACO,OAAO,CAAChG,OAAO,CAAC+F,cAAc,CAAC,GAAG,EAAE,CAAC,EACzE,CAACzG,mBAAmB,EAAE,YAAY,CAAC,EACnC,CAACC,iBAAiB,EAAEoB,IAAI,CAACiB,QAAQ,IAAI5B,OAAO,CAAC6B,QAAQ,IAAI,UAAU,CAAC,EACpE,CAACrC,mBAAmB,EAAEmB,IAAI,CAACa,IAAI,IAAI,WAAW,CAAC,EAC/C,CAAC/B,gBAAgB,EAAEkB,IAAI,CAACc,IAAI,IAAI,IAAI,CAAC,CACtC;IACDnB;GACD,CAAC,EACF;IACE,CAACZ,MAAM,GAAGA,MAAgB;IAC1BuG,MAAM,EAAE;MACN,GAAGjG,OAAO;MACVwB,IAAI,EAAEkB,MAAM,CAAC1C,OAAO,CAACwB,IAAI,CAAC,CAAC,CAAC,IAAId,SAAS;MACzCe,IAAI,EAAEiB,MAAM,CAAC1C,OAAO,CAACyB,IAAI,CAAC,CAAC,CAAC,IAAIf,SAAS;MACzCmB,QAAQ,EAAEa,MAAM,CAAC1C,OAAO,CAACkG,IAAI;MAC7BpE,QAAQ,EAAEY,MAAM,CAAC1C,OAAO,CAACmG,IAAI,GAAGhH,QAAQ,CAACY,IAAI,CAAC2C,MAAM,CAAC1C,OAAO,CAACmG,IAAI,CAAC,GAAGzF,SAAS;MAC9EkB,QAAQ,EAAEc,MAAM,CAAC1C,OAAO,CAAC4B;KAC1B;IACDwE,IAAI,EAAGhC,CAAU,IAAKiC,MAAM,CAACjC,CAAC,CAAC;IAC/B3D,KAAK,EAAG2D,CAA2B,IAAKkC,OAAO,CAAClC,CAAC,CAAC;IAClDmC,MAAM,EAAGC,OAAe,IACtBpH,MAAM,CAACqH,SAAS,CAAoBC,IAAI,IACtCzH,MAAM,CAAC2D,cAAc,CACnB3D,MAAM,CAAC4D,UAAU,CAAC;MAChBC,GAAG,EAAEA,CAAA,KAAMJ,MAAM,CAAC6D,MAAM,CAACC,OAAO,EAAGG,OAAO,IAAKD,IAAI,CAACE,MAAM,CAACD,OAAO,CAAC,CAAC;MACpE5D,KAAK,EAAGC,KAAK,IAAK,IAAIrE,QAAQ,CAAC;QAAEqE,KAAK;QAAEC,OAAO,EAAE;MAAkB,CAAE;KACtE,CAAC,EACF,CAAC;MAAE4D;IAAQ,CAAE,KAAK5H,MAAM,CAACiE,OAAO,CAAC,MAAM2D,QAAQ,EAAE,CAAC,CACnD,CACF;IACHC,MAAM,EAAEA,CAACN,OAAe,EAAEG,OAAe,KACvC1H,MAAM,CAAC4D,UAAU,CAAC;MAChBC,GAAG,EAAEA,CAAA,KAAMJ,MAAM,CAACoE,MAAM,CAACN,OAAO,EAAEG,OAAO,CAAC;MAC1C5D,KAAK,EAAGC,KAAK,IAAK,IAAIrE,QAAQ,CAAC;QAAEqE,KAAK;QAAEC,OAAO,EAAE;MAAkB,CAAE;KACtE;GACJ,CACF;AACH,CAAC,CAAC;AAEJ;;;;AAIA,OAAO,MAAM8D,WAAW,GACtBd,MAA0C,IAE1C/G,KAAK,CAAC8H,aAAa,CACjBlI,MAAM,CAACmI,MAAM,CAAChB,MAAM,CAAC,CAAC7C,IAAI,CACxBnE,MAAM,CAACqG,OAAO,CAACvF,IAAI,CAAC,EACpBd,MAAM,CAAC0F,GAAG,CAAEjC,MAAM,IAChB3D,OAAO,CAACgB,IAAI,CAACF,QAAQ,EAAE6C,MAAM,CAAC,CAACU,IAAI,CACjCrE,OAAO,CAACmI,GAAG,CAACxI,MAAM,CAACyI,SAAS,EAAEzE,MAAM,CAAC,CACtC,CACF,CACF,CACF,CAACU,IAAI,CAAClE,KAAK,CAACkI,OAAO,CAAC3I,UAAU,CAAC4I,KAAK,CAAC,CAAC;AAEzC;;;;AAIA,OAAO,MAAMA,KAAK,GAChBpB,MAAsB,IAEtB/G,KAAK,CAAC8H,aAAa,CACjB/H,MAAM,CAAC0F,GAAG,CAAC5E,IAAI,CAACkG,MAAM,CAAC,EAAGvD,MAAM,IAC9B3D,OAAO,CAACgB,IAAI,CAACF,QAAQ,EAAE6C,MAAM,CAAC,CAACU,IAAI,CACjCrE,OAAO,CAACmI,GAAG,CAACxI,MAAM,CAACyI,SAAS,EAAEzE,MAAM,CAAC,CACtC,CAAC,CACL,CAACU,IAAI,CAAClE,KAAK,CAACkI,OAAO,CAAC3I,UAAU,CAAC4I,KAAK,CAAC,CAAC;AAEzC;;;;AAIA,OAAO,MAAMlH,YAAY,GAAGA,CAC1BmH,SAAiC,EACjCjH,aAAa,GAAG,IAAI,KACE;EACtB,MAAMwD,EAAE,GAAGxE,QAAQ,CAAC;IAAEuB,GAAG,EAAE;EAAC,CAAE,CAAC;EAE/B,MAAM2G,cAAc,GAAGlH,aAAa,IAAIiH,SAAS,GAC7C1I,SAAS,CAAC4B,iBAAiB,CAAC8G,SAAS,CAAC,CAACvF,KAAK,GAC5CrB,SAAS;EAEb,OAAO9B,SAAS,CAACuB,YAAY,CAAW;IACtCqH,OAAO,EAAE,IAAI;IACbC,WAAWA,CAACrD,CAAC;MACX,OAAO,IAAIA,CAAC,EAAE;IAChB,CAAC;IACDsD,YAAY,EAAEJ,SAAS,GACrB,UAASvF,KAAK,EAAE4F,gBAAgB;MAC9B,OAAOA,gBAAgB,GAAGC,MAAM,CAAC7F,KAAK,CAAC,GAAG6F,MAAM,CAACN,SAAS,CAACvF,KAAK,CAAC,CAAC;IACpE,CAAC,GACD6F,MAAM;IACRC,cAAcA,CAACC,YAAY,EAAEC,UAAU,EAAEC,YAAY,EAAEhD,MAAM,EAAEiD,SAAS;MACtE,OAAO,CACL,WAAWH,YAAY,QAAQC,UAAU,GAAGC,YAAY,GAAGC,SAAS,GAAG,cAAcA,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAC1GA,SAAS,GACPjD,MAAM,CAACkD,IAAI,EAAE,CAACC,MAAM,CAACF,SAAS,CAAC,CAAC,CAAC,CAAC,GAClCjD,MAAM,CAACkD,IAAI,EAAE,CAChB;IACH,CAAC;IACDE,QAAQA,CAACC,IAAI,EAAEZ,WAAW,EAAEE,gBAAgB;MAC1C,QAAQU,IAAI,CAACC,IAAI;QACf,KAAK,QAAQ;UAAE;YACb,OAAO,CACLb,WAAW,CAAC/G,SAAS,CAAC,EACtB,CACEmD,EAAE,CAACuC,IAAI,CACLuB,gBAAgB,IAAIJ,cAAc,KAAK7G,SAAS,GAC5C2H,IAAI,CAACE,EAAE,GACPhB,cAAc,CAACc,IAAI,CAACE,EAAE,CAAC,CACrB,CACT,CACF;UACH;QACA,KAAK,SAAS;UAAE;YACd,MAAMC,KAAK,GAAG3E,EAAE,CAACpD,KAAK,CAAC4H,IAAI,CAACE,EAAS,CAAQ;YAC7C,MAAME,KAAK,GAAGJ,IAAI,CAACE,EAAE,CAAC,CAAC,CAAC;YACxB,QAAQ,OAAOE,KAAK;cAClB,KAAK,SAAS;gBAAE;kBACdD,KAAK,CAACH,IAAI,GAAG,IAAI;kBACjB;gBACF;cACA,KAAK,QAAQ;gBAAE;kBACbG,KAAK,CAACH,IAAI,GAAG,IAAI;kBACjB;gBACF;cACA;gBAAS;kBACPG,KAAK,CAACH,IAAI,GAAG,IAAI;kBACjB;gBACF;YACF;YACA,OAAO,CAACZ,WAAW,CAAC/G,SAAS,CAAC,EAAE,CAAC8H,KAAK,CAAC,CAAC;UAC1C;MACF;IACF;GACD,CAAC;AACJ,CAAC;AAED,MAAMZ,MAAM,gBAAGhJ,SAAS,CAAC8J,aAAa,CAAC,IAAI,CAAC;AAa5C;;;;AAIA,MAAMrC,MAAM,gBAAGzH,SAAS,CAAC+J,MAAM,CAAS,QAAQ,CAAC;AAOjD;;;;AAIA,MAAMrC,OAAO,gBAAG1H,SAAS,CAAC+J,MAAM,CAAU,SAAS,CAAC","ignoreList":[]}
1
+ {"version":3,"file":"PgClient.js","names":["Reactivity","Client","SqlError","Statement","Arr","Chunk","Config","Context","Duration","Effect","Fiber","Layer","Option","RcRef","Redacted","Scope","Stream","Pg","Cursor","ATTR_DB_SYSTEM_NAME","ATTR_DB_NAMESPACE","ATTR_SERVER_ADDRESS","ATTR_SERVER_PORT","TypeId","PgClient","GenericTag","make","options","gen","compiler","makeCompiler","transformQueryNames","transformJson","transformRows","transformResultNames","defaultTransforms","array","undefined","pool","Pool","connectionString","url","value","user","username","host","database","password","ssl","port","connectionTimeoutMillis","connectTimeout","toMillis","idleTimeoutMillis","idleTimeout","max","maxConnections","min","minConnections","maxLifetimeSeconds","connectionTTL","toSeconds","application_name","applicationName","types","on","_err","acquireRelease","tryPromise","try","query","catch","cause","message","promise","end","pipe","interruptible","timeoutOption","timeoutFail","duration","seconds","onTimeout","Error","ConnectionImpl","pg","constructor","run","params","async","resume","err","result","fail","rows","Array","isArray","map","r","succeed","execute","sql","executeRaw","executeWithoutTransform","executeValues","text","rowMode","values","executeUnprepared","executeStream","self","cursor","sync","close","pull","read","some","isNonEmptyArray","unsafeFromArray","none","repeatEffectChunkOption","unwrapScoped","reserveRaw","fiber","getOrThrow","getCurrentFiber","scope","unsafeGet","currentContext","connect","client","release","as","addFinalizer","reserve","listenClient","acquire","Object","assign","acquirer","transactionAcquirer","spanAttributes","entries","config","json","_","PgJson","listen","channel","asyncPush","fnUntraced","emit","get","onNotification","msg","payload","single","off","escapeIdentifier","notify","void","layerConfig","scopedContext","unwrap","flatMap","add","SqlClient","provide","layer","transform","transformValue","dialect","placeholder","onIdentifier","withoutTransform","escape","onRecordUpdate","placeholders","valueAlias","valueColumns","returning","flat","concat","onCustom","type","kind","i0","defaultEscape","custom"],"sources":["../../src/PgClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/sql-pg",
3
- "version": "0.47.0",
3
+ "version": "0.49.0",
4
4
  "description": "A PostgreSQL toolkit for Effect",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -11,13 +11,14 @@
11
11
  "sideEffects": [],
12
12
  "homepage": "https://effect.website",
13
13
  "dependencies": {
14
- "postgres": "^3.4.4"
14
+ "pg": "^8.16.3",
15
+ "pg-cursor": "^2.15.3"
15
16
  },
16
17
  "peerDependencies": {
17
- "@effect/experimental": "^0.56.0",
18
- "@effect/platform": "^0.92.0",
19
- "@effect/sql": "^0.46.0",
20
- "effect": "^3.18.0"
18
+ "@effect/experimental": "^0.57.0",
19
+ "@effect/platform": "^0.93.0",
20
+ "@effect/sql": "^0.48.0",
21
+ "effect": "^3.19.0"
21
22
  },
22
23
  "publishConfig": {
23
24
  "provenance": true