@slonik/pg-driver 48.8.5 → 48.8.7
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPgDriverFactory.d.ts","sourceRoot":"","sources":["../../src/factories/createPgDriverFactory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,aAAa,EAEd,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"createPgDriverFactory.d.ts","sourceRoot":"","sources":["../../src/factories/createPgDriverFactory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,aAAa,EAEd,MAAM,gBAAgB,CAAC;AAuPxB,eAAO,MAAM,qBAAqB,QAAO,aA8IxC,CAAC"}
|
|
@@ -104,10 +104,13 @@ const createClientConfiguration = (clientConfiguration) => {
|
|
|
104
104
|
};
|
|
105
105
|
const queryTypeOverrides = async (pgClientConfiguration, driverConfiguration) => {
|
|
106
106
|
const client = new Client(pgClientConfiguration);
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
107
|
+
try {
|
|
108
|
+
await client.connect();
|
|
109
|
+
return await createTypeOverrides(client, driverConfiguration.typeParsers);
|
|
110
|
+
}
|
|
111
|
+
finally {
|
|
112
|
+
await client.end();
|
|
113
|
+
}
|
|
111
114
|
};
|
|
112
115
|
const isErrorWithCode = (error) => {
|
|
113
116
|
return 'code' in error;
|
|
@@ -192,7 +195,14 @@ export const createPgDriverFactory = () => {
|
|
|
192
195
|
client.on('notice', onNotice);
|
|
193
196
|
return {
|
|
194
197
|
connect: async () => {
|
|
195
|
-
|
|
198
|
+
try {
|
|
199
|
+
await client.connect();
|
|
200
|
+
}
|
|
201
|
+
catch (error) {
|
|
202
|
+
client.removeListener('error', onError);
|
|
203
|
+
client.removeListener('notice', onNotice);
|
|
204
|
+
throw error;
|
|
205
|
+
}
|
|
196
206
|
},
|
|
197
207
|
end: async () => {
|
|
198
208
|
await client.end();
|
|
@@ -231,13 +241,17 @@ export const createPgDriverFactory = () => {
|
|
|
231
241
|
// `rowDescription` will not fire if the query produces a syntax error.
|
|
232
242
|
// Also, `rowDescription` won't fire until client starts consuming the stream.
|
|
233
243
|
// This is why we cannot simply await for `rowDescription` event before starting to pipe the stream.
|
|
234
|
-
|
|
244
|
+
const onRowDescription = (rowDescription) => {
|
|
235
245
|
fields = rowDescription.fields.map((field) => {
|
|
236
246
|
return {
|
|
237
247
|
dataTypeId: field.dataTypeID,
|
|
238
248
|
name: field.name,
|
|
239
249
|
};
|
|
240
250
|
});
|
|
251
|
+
};
|
|
252
|
+
client.connection.once('rowDescription', onRowDescription);
|
|
253
|
+
stream.once('close', () => {
|
|
254
|
+
client.connection.removeListener('rowDescription', onRowDescription);
|
|
241
255
|
});
|
|
242
256
|
const transform = new Transform({
|
|
243
257
|
objectMode: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPgDriverFactory.js","sourceRoot":"","sources":["../../src/factories/createPgDriverFactory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"createPgDriverFactory.js","sourceRoot":"","sources":["../../src/factories/createPgDriverFactory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -16,11 +16,11 @@
|
|
|
16
16
|
]
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@slonik/driver": "^48.8.
|
|
20
|
-
"@slonik/errors": "^48.8.
|
|
21
|
-
"@slonik/sql-tag": "^48.8.
|
|
22
|
-
"@slonik/types": "^48.8.
|
|
23
|
-
"@slonik/utilities": "^48.8.
|
|
19
|
+
"@slonik/driver": "^48.8.7",
|
|
20
|
+
"@slonik/errors": "^48.8.7",
|
|
21
|
+
"@slonik/sql-tag": "^48.8.7",
|
|
22
|
+
"@slonik/types": "^48.8.7",
|
|
23
|
+
"@slonik/utilities": "^48.8.7",
|
|
24
24
|
"pg": "^8.16.3",
|
|
25
25
|
"pg-query-stream": "^4.10.3",
|
|
26
26
|
"pg-types": "^4.1.0",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"tsimp": "^2.0.12",
|
|
37
37
|
"typescript": "^5.9.3",
|
|
38
38
|
"typescript-eslint": "^8.47.0",
|
|
39
|
-
"@slonik/eslint-config": "^48.8.
|
|
39
|
+
"@slonik/eslint-config": "^48.8.7"
|
|
40
40
|
},
|
|
41
41
|
"engines": {
|
|
42
42
|
"node": ">=24"
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
},
|
|
63
63
|
"type": "module",
|
|
64
64
|
"types": "./dist/index.d.ts",
|
|
65
|
-
"version": "48.8.
|
|
65
|
+
"version": "48.8.7",
|
|
66
66
|
"scripts": {
|
|
67
67
|
"build": "rm -fr ./dist && tsc --project ./tsconfig.json",
|
|
68
68
|
"lint": "npm run lint:cspell && npm run lint:eslint && npm run lint:tsc",
|
|
@@ -167,16 +167,12 @@ const queryTypeOverrides = async (
|
|
|
167
167
|
): Promise<TypeOverrides> => {
|
|
168
168
|
const client = new Client(pgClientConfiguration);
|
|
169
169
|
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
await client.end();
|
|
178
|
-
|
|
179
|
-
return typeOverrides;
|
|
170
|
+
try {
|
|
171
|
+
await client.connect();
|
|
172
|
+
return await createTypeOverrides(client, driverConfiguration.typeParsers);
|
|
173
|
+
} finally {
|
|
174
|
+
await client.end();
|
|
175
|
+
}
|
|
180
176
|
};
|
|
181
177
|
|
|
182
178
|
const isErrorWithCode = (error: Error): error is DatabaseError => {
|
|
@@ -292,7 +288,14 @@ export const createPgDriverFactory = (): DriverFactory => {
|
|
|
292
288
|
|
|
293
289
|
return {
|
|
294
290
|
connect: async () => {
|
|
295
|
-
|
|
291
|
+
try {
|
|
292
|
+
await client.connect();
|
|
293
|
+
} catch (error) {
|
|
294
|
+
client.removeListener('error', onError);
|
|
295
|
+
client.removeListener('notice', onNotice);
|
|
296
|
+
|
|
297
|
+
throw error;
|
|
298
|
+
}
|
|
296
299
|
},
|
|
297
300
|
end: async () => {
|
|
298
301
|
await client.end();
|
|
@@ -340,13 +343,22 @@ export const createPgDriverFactory = (): DriverFactory => {
|
|
|
340
343
|
// `rowDescription` will not fire if the query produces a syntax error.
|
|
341
344
|
// Also, `rowDescription` won't fire until client starts consuming the stream.
|
|
342
345
|
// This is why we cannot simply await for `rowDescription` event before starting to pipe the stream.
|
|
343
|
-
|
|
346
|
+
const onRowDescription = (rowDescription) => {
|
|
344
347
|
fields = rowDescription.fields.map((field) => {
|
|
345
348
|
return {
|
|
346
349
|
dataTypeId: field.dataTypeID,
|
|
347
350
|
name: field.name,
|
|
348
351
|
};
|
|
349
352
|
});
|
|
353
|
+
};
|
|
354
|
+
|
|
355
|
+
client.connection.once('rowDescription', onRowDescription);
|
|
356
|
+
|
|
357
|
+
stream.once('close', () => {
|
|
358
|
+
client.connection.removeListener(
|
|
359
|
+
'rowDescription',
|
|
360
|
+
onRowDescription,
|
|
361
|
+
);
|
|
350
362
|
});
|
|
351
363
|
|
|
352
364
|
const transform = new Transform({
|