@effect/sql-pg 0.49.3 → 0.49.5

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.
@@ -15,14 +15,15 @@ var Context = _interopRequireWildcard(require("effect/Context"));
15
15
  var Duration = _interopRequireWildcard(require("effect/Duration"));
16
16
  var Effect = _interopRequireWildcard(require("effect/Effect"));
17
17
  var Fiber = _interopRequireWildcard(require("effect/Fiber"));
18
- var Function = _interopRequireWildcard(require("effect/Function"));
19
18
  var Layer = _interopRequireWildcard(require("effect/Layer"));
19
+ var Number = _interopRequireWildcard(require("effect/Number"));
20
20
  var Option = _interopRequireWildcard(require("effect/Option"));
21
21
  var RcRef = _interopRequireWildcard(require("effect/RcRef"));
22
22
  var Redacted = _interopRequireWildcard(require("effect/Redacted"));
23
23
  var Scope = _interopRequireWildcard(require("effect/Scope"));
24
24
  var Stream = _interopRequireWildcard(require("effect/Stream"));
25
25
  var Pg = _interopRequireWildcard(require("pg"));
26
+ var PgConnString = _interopRequireWildcard(require("pg-connection-string"));
26
27
  var _pgCursor = _interopRequireDefault(require("pg-cursor"));
27
28
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
28
29
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
@@ -97,28 +98,31 @@ const make = options => Effect.gen(function* () {
97
98
  let done = false;
98
99
  let cancel = undefined;
99
100
  let client = undefined;
100
- let release = Function.constVoid;
101
101
  function onError(cause) {
102
- release(cause);
102
+ cleanup(cause);
103
103
  resume(Effect.fail(new _SqlError.SqlError({
104
104
  cause,
105
105
  message: "Connection error"
106
106
  })));
107
107
  }
108
108
  function cleanup(cause) {
109
- if (!done) release(cause);
109
+ if (!done) client?.release(cause);
110
110
  done = true;
111
111
  client?.off("error", onError);
112
112
  }
113
- pool.connect((cause, client_, release_) => {
114
- release = release_;
113
+ pool.connect((cause, client_) => {
115
114
  if (cause) {
116
115
  return resume(Effect.fail(new _SqlError.SqlError({
117
116
  cause,
118
117
  message: "Failed to acquire connection"
119
118
  })));
119
+ } else if (!client_) {
120
+ return resume(Effect.fail(new _SqlError.SqlError({
121
+ message: "Failed to acquire connection",
122
+ cause: new Error("No client returned")
123
+ })));
120
124
  } else if (done) {
121
- release();
125
+ client_.release();
122
126
  return;
123
127
  }
124
128
  client = client_;
@@ -243,6 +247,22 @@ const make = options => Effect.gen(function* () {
243
247
  const listenClient = yield* RcRef.make({
244
248
  acquire: reserveRaw
245
249
  });
250
+ let config = options;
251
+ if (pool.options.connectionString) {
252
+ try {
253
+ const parsed = PgConnString.parse(pool.options.connectionString);
254
+ config = {
255
+ ...config,
256
+ host: config.host ?? parsed.host ?? undefined,
257
+ port: config.port ?? (parsed.port ? Option.getOrUndefined(Number.parse(parsed.port)) : undefined),
258
+ username: config.username ?? parsed.user ?? undefined,
259
+ password: config.password ?? (parsed.password ? Redacted.make(parsed.password) : undefined),
260
+ database: config.database ?? parsed.database ?? undefined
261
+ };
262
+ } catch {
263
+ //
264
+ }
265
+ }
246
266
  return Object.assign(yield* Client.make({
247
267
  acquirer: Effect.succeed(new ConnectionImpl()),
248
268
  transactionAcquirer: reserve,
@@ -251,14 +271,7 @@ const make = options => Effect.gen(function* () {
251
271
  transformRows
252
272
  }), {
253
273
  [TypeId]: TypeId,
254
- config: {
255
- ...options,
256
- host: pool.options.host,
257
- port: pool.options.port,
258
- username: pool.options.user,
259
- password: typeof pool.options.password === "string" ? Redacted.make(pool.options.password) : undefined,
260
- database: pool.options.database
261
- },
274
+ config,
262
275
  json: _ => PgJson(_),
263
276
  listen: channel => Stream.asyncPush(Effect.fnUntraced(function* (emit) {
264
277
  const client = yield* RcRef.get(listenClient);
@@ -1 +1 @@
1
- {"version":3,"file":"PgClient.js","names":["Reactivity","_interopRequireWildcard","require","Client","_SqlError","Statement","Arr","Chunk","Config","Context","Duration","Effect","Fiber","Function","Layer","Option","RcRef","Redacted","Scope","Stream","Pg","_pgCursor","_interopRequireDefault","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ATTR_DB_SYSTEM_NAME","ATTR_DB_NAMESPACE","ATTR_SERVER_ADDRESS","ATTR_SERVER_PORT","TypeId","exports","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","SqlError","message","promise","end","pipe","interruptible","timeoutOption","timeoutFail","duration","seconds","onTimeout","Error","ConnectionImpl","pg","constructor","runWithClient","async","resume","makeCancel","done","cancel","client","release","constVoid","onError","fail","cleanup","off","connect","client_","release_","once","eff","suspend","void","ensuring","sync","run","params","err","result","succeed","Array","isArray","map","rows","execute","sql","executeRaw","executeWithoutTransform","executeValues","text","rowMode","values","executeUnprepared","executeStream","self","cursor","Cursor","close","pull","read","some","isNonEmptyArray","unsafeFromArray","none","repeatEffectChunkOption","unwrapScoped","reserveRaw","fiber","getOrThrow","getCurrentFiber","scope","unsafeGet","currentContext","as","addFinalizer","cause_","reserve","listenClient","acquire","assign","acquirer","transactionAcquirer","spanAttributes","entries","config","json","_","PgJson","listen","channel","asyncPush","fnUntraced","emit","onNotification","msg","payload","single","escapeIdentifier","notify","cancelEffects","processId","processID","ending","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":[]}
1
+ {"version":3,"file":"PgClient.js","names":["Reactivity","_interopRequireWildcard","require","Client","_SqlError","Statement","Arr","Chunk","Config","Context","Duration","Effect","Fiber","Layer","Number","Option","RcRef","Redacted","Scope","Stream","Pg","PgConnString","_pgCursor","_interopRequireDefault","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ATTR_DB_SYSTEM_NAME","ATTR_DB_NAMESPACE","ATTR_SERVER_ADDRESS","ATTR_SERVER_PORT","TypeId","exports","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","SqlError","message","promise","end","pipe","interruptible","timeoutOption","timeoutFail","duration","seconds","onTimeout","Error","ConnectionImpl","pg","constructor","runWithClient","async","resume","makeCancel","done","cancel","client","onError","cleanup","fail","release","off","connect","client_","once","eff","suspend","void","ensuring","sync","run","params","err","result","succeed","Array","isArray","map","rows","execute","sql","executeRaw","executeWithoutTransform","executeValues","text","rowMode","values","executeUnprepared","executeStream","self","cursor","Cursor","close","pull","read","some","isNonEmptyArray","unsafeFromArray","none","repeatEffectChunkOption","unwrapScoped","reserveRaw","fiber","getOrThrow","getCurrentFiber","scope","unsafeGet","currentContext","as","addFinalizer","cause_","reserve","listenClient","acquire","config","parsed","parse","getOrUndefined","assign","acquirer","transactionAcquirer","spanAttributes","entries","json","_","PgJson","listen","channel","asyncPush","fnUntraced","emit","onNotification","msg","payload","single","escapeIdentifier","notify","cancelEffects","processId","processID","ending","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":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"PgClient.d.ts","sourceRoot":"","sources":["../../src/PgClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PgClient.d.ts","sourceRoot":"","sources":["../../src/PgClient.ts"],"names":[],"mappings":"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"}
@@ -12,14 +12,15 @@ import * as Context from "effect/Context";
12
12
  import * as Duration from "effect/Duration";
13
13
  import * as Effect from "effect/Effect";
14
14
  import * as Fiber from "effect/Fiber";
15
- import * as Function from "effect/Function";
16
15
  import * as Layer from "effect/Layer";
16
+ import * as Number from "effect/Number";
17
17
  import * as Option from "effect/Option";
18
18
  import * as RcRef from "effect/RcRef";
19
19
  import * as Redacted from "effect/Redacted";
20
20
  import * as Scope from "effect/Scope";
21
21
  import * as Stream from "effect/Stream";
22
22
  import * as Pg from "pg";
23
+ import * as PgConnString from "pg-connection-string";
23
24
  import Cursor from "pg-cursor";
24
25
  const ATTR_DB_SYSTEM_NAME = "db.system.name";
25
26
  const ATTR_DB_NAMESPACE = "db.namespace";
@@ -88,28 +89,31 @@ export const make = options => Effect.gen(function* () {
88
89
  let done = false;
89
90
  let cancel = undefined;
90
91
  let client = undefined;
91
- let release = Function.constVoid;
92
92
  function onError(cause) {
93
- release(cause);
93
+ cleanup(cause);
94
94
  resume(Effect.fail(new SqlError({
95
95
  cause,
96
96
  message: "Connection error"
97
97
  })));
98
98
  }
99
99
  function cleanup(cause) {
100
- if (!done) release(cause);
100
+ if (!done) client?.release(cause);
101
101
  done = true;
102
102
  client?.off("error", onError);
103
103
  }
104
- pool.connect((cause, client_, release_) => {
105
- release = release_;
104
+ pool.connect((cause, client_) => {
106
105
  if (cause) {
107
106
  return resume(Effect.fail(new SqlError({
108
107
  cause,
109
108
  message: "Failed to acquire connection"
110
109
  })));
110
+ } else if (!client_) {
111
+ return resume(Effect.fail(new SqlError({
112
+ message: "Failed to acquire connection",
113
+ cause: new Error("No client returned")
114
+ })));
111
115
  } else if (done) {
112
- release();
116
+ client_.release();
113
117
  return;
114
118
  }
115
119
  client = client_;
@@ -234,6 +238,22 @@ export const make = options => Effect.gen(function* () {
234
238
  const listenClient = yield* RcRef.make({
235
239
  acquire: reserveRaw
236
240
  });
241
+ let config = options;
242
+ if (pool.options.connectionString) {
243
+ try {
244
+ const parsed = PgConnString.parse(pool.options.connectionString);
245
+ config = {
246
+ ...config,
247
+ host: config.host ?? parsed.host ?? undefined,
248
+ port: config.port ?? (parsed.port ? Option.getOrUndefined(Number.parse(parsed.port)) : undefined),
249
+ username: config.username ?? parsed.user ?? undefined,
250
+ password: config.password ?? (parsed.password ? Redacted.make(parsed.password) : undefined),
251
+ database: config.database ?? parsed.database ?? undefined
252
+ };
253
+ } catch {
254
+ //
255
+ }
256
+ }
237
257
  return Object.assign(yield* Client.make({
238
258
  acquirer: Effect.succeed(new ConnectionImpl()),
239
259
  transactionAcquirer: reserve,
@@ -242,14 +262,7 @@ export const make = options => Effect.gen(function* () {
242
262
  transformRows
243
263
  }), {
244
264
  [TypeId]: TypeId,
245
- config: {
246
- ...options,
247
- host: pool.options.host,
248
- port: pool.options.port,
249
- username: pool.options.user,
250
- password: typeof pool.options.password === "string" ? Redacted.make(pool.options.password) : undefined,
251
- database: pool.options.database
252
- },
265
+ config,
253
266
  json: _ => PgJson(_),
254
267
  listen: channel => Stream.asyncPush(Effect.fnUntraced(function* (emit) {
255
268
  const client = yield* RcRef.get(listenClient);
@@ -1 +1 @@
1
- {"version":3,"file":"PgClient.js","names":["Reactivity","Client","SqlError","Statement","Arr","Chunk","Config","Context","Duration","Effect","Fiber","Function","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","runWithClient","f","async","resume","makeCancel","done","cancel","client","release","constVoid","onError","fail","cleanup","off","connect","client_","release_","once","eff","suspend","void","ensuring","sync","run","params","err","result","succeed","Array","isArray","map","r","rows","execute","sql","executeRaw","executeWithoutTransform","executeValues","text","rowMode","values","executeUnprepared","executeStream","self","cursor","close","pull","read","some","isNonEmptyArray","unsafeFromArray","none","repeatEffectChunkOption","unwrapScoped","reserveRaw","fiber","getOrThrow","getCurrentFiber","scope","unsafeGet","currentContext","as","addFinalizer","cause_","reserve","listenClient","acquire","Object","assign","acquirer","transactionAcquirer","spanAttributes","entries","config","json","_","PgJson","listen","channel","asyncPush","fnUntraced","emit","get","onNotification","msg","payload","single","escapeIdentifier","notify","cancelEffects","WeakMap","has","processId","processID","ending","set","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":[]}
1
+ {"version":3,"file":"PgClient.js","names":["Reactivity","Client","SqlError","Statement","Arr","Chunk","Config","Context","Duration","Effect","Fiber","Layer","Number","Option","RcRef","Redacted","Scope","Stream","Pg","PgConnString","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","runWithClient","f","async","resume","makeCancel","done","cancel","client","onError","cleanup","fail","release","off","connect","client_","once","eff","suspend","void","ensuring","sync","run","params","err","result","succeed","Array","isArray","map","r","rows","execute","sql","executeRaw","executeWithoutTransform","executeValues","text","rowMode","values","executeUnprepared","executeStream","self","cursor","close","pull","read","some","isNonEmptyArray","unsafeFromArray","none","repeatEffectChunkOption","unwrapScoped","reserveRaw","fiber","getOrThrow","getCurrentFiber","scope","unsafeGet","currentContext","as","addFinalizer","cause_","reserve","listenClient","acquire","config","parsed","parse","getOrUndefined","Object","assign","acquirer","transactionAcquirer","spanAttributes","entries","json","_","PgJson","listen","channel","asyncPush","fnUntraced","emit","get","onNotification","msg","payload","single","escapeIdentifier","notify","cancelEffects","WeakMap","has","processId","processID","ending","set","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.49.3",
3
+ "version": "0.49.5",
4
4
  "description": "A PostgreSQL toolkit for Effect",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -12,15 +12,16 @@
12
12
  "homepage": "https://effect.website",
13
13
  "dependencies": {
14
14
  "pg": "^8.16.3",
15
+ "pg-connection-string": "2.9.1",
15
16
  "pg-cursor": "^2.15.3",
16
17
  "pg-pool": "^3.10.1",
17
18
  "pg-types": "^4.1.0"
18
19
  },
19
20
  "peerDependencies": {
20
- "@effect/experimental": "^0.57.0",
21
- "@effect/platform": "^0.93.0",
21
+ "@effect/experimental": "^0.57.1",
22
22
  "@effect/sql": "^0.48.0",
23
- "effect": "^3.19.3"
23
+ "effect": "^3.19.3",
24
+ "@effect/platform": "^0.93.1"
24
25
  },
25
26
  "publishConfig": {
26
27
  "provenance": true
package/src/PgClient.ts CHANGED
@@ -15,8 +15,8 @@ import * as Context from "effect/Context"
15
15
  import * as Duration from "effect/Duration"
16
16
  import * as Effect from "effect/Effect"
17
17
  import * as Fiber from "effect/Fiber"
18
- import * as Function from "effect/Function"
19
18
  import * as Layer from "effect/Layer"
19
+ import * as Number from "effect/Number"
20
20
  import * as Option from "effect/Option"
21
21
  import * as RcRef from "effect/RcRef"
22
22
  import * as Redacted from "effect/Redacted"
@@ -24,6 +24,7 @@ import * as Scope from "effect/Scope"
24
24
  import * as Stream from "effect/Stream"
25
25
  import type { ConnectionOptions } from "node:tls"
26
26
  import * as Pg from "pg"
27
+ import * as PgConnString from "pg-connection-string"
27
28
  import Cursor from "pg-cursor"
28
29
 
29
30
  const ATTR_DB_SYSTEM_NAME = "db.system.name"
@@ -175,25 +176,29 @@ export const make = (
175
176
  let done = false
176
177
  let cancel: Effect.Effect<void> | undefined = undefined
177
178
  let client: Pg.PoolClient | undefined = undefined
178
- let release: (err?: Error) => void = Function.constVoid
179
179
  function onError(cause: Error) {
180
- release(cause)
180
+ cleanup(cause)
181
181
  resume(Effect.fail(new SqlError({ cause, message: "Connection error" })))
182
182
  }
183
183
  function cleanup(cause?: Error) {
184
- if (!done) release(cause)
184
+ if (!done) client?.release(cause)
185
185
  done = true
186
186
  client?.off("error", onError)
187
187
  }
188
- pool.connect((cause, client_, release_) => {
189
- release = release_
188
+ pool.connect((cause, client_) => {
190
189
  if (cause) {
191
190
  return resume(Effect.fail(new SqlError({ cause, message: "Failed to acquire connection" })))
191
+ } else if (!client_) {
192
+ return resume(
193
+ Effect.fail(
194
+ new SqlError({ message: "Failed to acquire connection", cause: new Error("No client returned") })
195
+ )
196
+ )
192
197
  } else if (done) {
193
- release()
198
+ client_.release()
194
199
  return
195
200
  }
196
- client = client_!
201
+ client = client_
197
202
  client.once("error", onError)
198
203
  cancel = makeCancel(pool, client)
199
204
  f(client, (eff) => {
@@ -337,6 +342,23 @@ export const make = (
337
342
  acquire: reserveRaw
338
343
  })
339
344
 
345
+ let config = options
346
+ if (pool.options.connectionString) {
347
+ try {
348
+ const parsed = PgConnString.parse(pool.options.connectionString)
349
+ config = {
350
+ ...config,
351
+ host: config.host ?? parsed.host ?? undefined,
352
+ port: config.port ?? (parsed.port ? Option.getOrUndefined(Number.parse(parsed.port)) : undefined),
353
+ username: config.username ?? parsed.user ?? undefined,
354
+ password: config.password ?? (parsed.password ? Redacted.make(parsed.password) : undefined),
355
+ database: config.database ?? parsed.database ?? undefined
356
+ }
357
+ } catch {
358
+ //
359
+ }
360
+ }
361
+
340
362
  return Object.assign(
341
363
  yield* Client.make({
342
364
  acquirer: Effect.succeed(new ConnectionImpl()),
@@ -353,14 +375,7 @@ export const make = (
353
375
  }),
354
376
  {
355
377
  [TypeId]: TypeId as TypeId,
356
- config: {
357
- ...options,
358
- host: pool.options.host,
359
- port: pool.options.port,
360
- username: pool.options.user,
361
- password: typeof pool.options.password === "string" ? Redacted.make(pool.options.password) : undefined,
362
- database: pool.options.database
363
- },
378
+ config,
364
379
  json: (_: unknown) => PgJson(_),
365
380
  listen: (channel: string) =>
366
381
  Stream.asyncPush<string, SqlError>(Effect.fnUntraced(function*(emit) {