pogi 2.10.1 → 3.0.0-beta
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/.vscode/launch.json +47 -15
- package/CHANGELOG.md +20 -0
- package/docs/API/PgDb.md +25 -0
- package/docs/notification.md +19 -0
- package/jest.config.js +23 -0
- package/lib/bin/generateInterface.js +2 -2
- package/lib/bin/generateInterface.js.map +1 -1
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/pgConverters.d.ts +2 -0
- package/lib/pgConverters.js +27 -10
- package/lib/pgConverters.js.map +1 -1
- package/lib/pgDb.d.ts +15 -6
- package/lib/pgDb.js +263 -67
- package/lib/pgDb.js.map +1 -1
- package/lib/pgTable.js +7 -7
- package/lib/pgTable.js.map +1 -1
- package/lib/pgUtils.d.ts +3 -1
- package/lib/pgUtils.js +61 -23
- package/lib/pgUtils.js.map +1 -1
- package/lib/queryAble.d.ts +16 -1
- package/lib/queryAble.js +124 -56
- package/lib/queryAble.js.map +1 -1
- package/lib/src/bin/generateInterface.d.ts +1 -0
- package/lib/src/bin/generateInterface.js +53 -0
- package/lib/src/bin/generateInterface.js.map +1 -0
- package/lib/src/connectionOptions.d.ts +34 -0
- package/lib/src/connectionOptions.js +3 -0
- package/lib/src/connectionOptions.js.map +1 -0
- package/lib/src/index.d.ts +6 -0
- package/lib/src/index.js +12 -0
- package/lib/src/index.js.map +1 -0
- package/lib/src/pgConverters.d.ts +9 -0
- package/lib/src/pgConverters.js +71 -0
- package/lib/src/pgConverters.js.map +1 -0
- package/lib/src/pgConverters.test.d.ts +1 -0
- package/lib/src/pgConverters.test.js +13 -0
- package/lib/src/pgConverters.test.js.map +1 -0
- package/lib/src/pgDb.d.ts +79 -0
- package/lib/src/pgDb.js +764 -0
- package/lib/src/pgDb.js.map +1 -0
- package/lib/src/pgDb.test.d.ts +1 -0
- package/lib/src/pgDb.test.js +1126 -0
- package/lib/src/pgDb.test.js.map +1 -0
- package/lib/src/pgDbInterface.js +11 -0
- package/lib/src/pgDbInterface.js.map +1 -0
- package/lib/src/pgDbLogger.d.ts +5 -0
- package/lib/src/pgDbLogger.js +3 -0
- package/lib/src/pgDbLogger.js.map +1 -0
- package/lib/src/pgDbOperators.d.ts +113 -0
- package/lib/src/pgDbOperators.js +41 -0
- package/lib/src/pgDbOperators.js.map +1 -0
- package/lib/src/pgDbOperators.test.d.ts +1 -0
- package/lib/src/pgDbOperators.test.js +313 -0
- package/lib/src/pgDbOperators.test.js.map +1 -0
- package/lib/src/pgSchema.d.ts +17 -0
- package/lib/src/pgSchema.js +16 -0
- package/lib/src/pgSchema.js.map +1 -0
- package/lib/src/pgSchemaInterface.d.ts +12 -0
- package/lib/src/pgSchemaInterface.js +3 -0
- package/lib/src/pgSchemaInterface.js.map +1 -0
- package/lib/src/pgTable.d.ts +105 -0
- package/lib/src/pgTable.js +322 -0
- package/lib/src/pgTable.js.map +1 -0
- package/lib/src/pgTableInterface.d.ts +102 -0
- package/lib/src/pgTableInterface.js +4 -0
- package/lib/src/pgTableInterface.js.map +1 -0
- package/lib/src/pgUtils.d.ts +41 -0
- package/lib/src/pgUtils.js +282 -0
- package/lib/src/pgUtils.js.map +1 -0
- package/lib/src/queryAble.d.ts +40 -0
- package/lib/src/queryAble.js +338 -0
- package/lib/src/queryAble.js.map +1 -0
- package/lib/src/queryAbleInterface.d.ts +59 -0
- package/lib/src/queryAbleInterface.js +7 -0
- package/lib/src/queryAbleInterface.js.map +1 -0
- package/lib/src/queryWhere.d.ts +8 -0
- package/lib/src/queryWhere.js +245 -0
- package/lib/src/queryWhere.js.map +1 -0
- package/mkdocs.yml +1 -0
- package/package.json +23 -14
- package/src/bin/generateInterface.ts +2 -2
- package/src/connectionOptions.ts +46 -13
- package/src/index.d.ts +7 -0
- package/src/pgConverters.test.ts +10 -0
- package/src/pgConverters.ts +34 -22
- package/src/pgDb.test.ts +1324 -0
- package/src/pgDb.ts +321 -125
- package/src/pgDbInterface.ts +57 -0
- package/src/pgDbOperators.test.ts +478 -0
- package/src/pgDbOperators.ts +45 -22
- package/src/pgSchema.ts +10 -9
- package/src/pgSchemaInterface.ts +12 -0
- package/src/pgTable.ts +65 -97
- package/src/pgTableInterface.ts +131 -0
- package/src/pgUtils.ts +156 -42
- package/src/queryAble.ts +167 -125
- package/src/queryAbleInterface.ts +108 -0
- package/src/queryWhere.ts +42 -43
- package/{spec/resources → src/test}/init.sql +23 -0
- package/src/test/pgServiceRestartTest.ts +1500 -0
- package/{spec/resources → src/test}/throw_exception.sql +0 -0
- package/{spec/resources → src/test}/tricky.sql +0 -0
- package/{src/tsconfig.json → tsconfig.json} +9 -6
- package/spec/run.js +0 -5
- package/spec/support/jasmine.json +0 -9
- package/src/test/pgDbOperatorSpec.ts +0 -492
- package/src/test/pgDbSpec.ts +0 -994
package/lib/pgTable.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pgTable.js","sourceRoot":"","sources":["../src/pgTable.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pgTable.js","sourceRoot":"","sources":["../src/pgTable.ts"],"names":[],"mappings":"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"}
|
package/lib/pgUtils.d.ts
CHANGED
|
@@ -8,7 +8,9 @@ export declare let pgUtils: {
|
|
|
8
8
|
params: any;
|
|
9
9
|
connection;
|
|
10
10
|
}): void;
|
|
11
|
-
|
|
11
|
+
quoteFieldNameInsecure(f: string): string;
|
|
12
|
+
quoteFieldName(f: string): string;
|
|
13
|
+
quoteFieldNameOrPosition(f: string | number): string;
|
|
12
14
|
processQueryFields(options: QueryOptions): string;
|
|
13
15
|
processNamedParams(sql: string, params: Object): {
|
|
14
16
|
sql: string;
|
package/lib/pgUtils.js
CHANGED
|
@@ -3,23 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.pgUtils = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const pgDb_1 = require("./pgDb");
|
|
6
|
-
const
|
|
7
|
-
const util = require('util');
|
|
6
|
+
const util = require("util");
|
|
8
7
|
const NAMED_PARAMS_REGEXP = /(?:^|[^:]):(!?[a-zA-Z0-9_]+)/g;
|
|
9
|
-
const ASC_DESC_REGEXP = /^(
|
|
8
|
+
const ASC_DESC_REGEXP = /^(.+?)(?:\s+(asc|desc))?$/i;
|
|
10
9
|
exports.pgUtils = {
|
|
11
10
|
logError(logger, options) {
|
|
12
11
|
let { error, sql, params, connection } = options;
|
|
13
12
|
logger.error(error, sql, util.inspect(logger.paramSanitizer ? logger.paramSanitizer(params) : params, false, null), connection ? connection.processID : null);
|
|
14
13
|
},
|
|
15
|
-
|
|
14
|
+
quoteFieldNameInsecure(f) {
|
|
16
15
|
return f.indexOf('"') == -1 && f.indexOf('(') == -1 ? '"' + f + '"' : f;
|
|
17
16
|
},
|
|
17
|
+
quoteFieldName(f) {
|
|
18
|
+
if (typeof f === 'string' && f.length) {
|
|
19
|
+
return `"${f
|
|
20
|
+
.replace(/^\s*"*/, '')
|
|
21
|
+
.replace(/"*\s*$/, '')
|
|
22
|
+
.replace(/"/g, '""')}"`;
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
throw new Error(`Invalid field: ${f}`);
|
|
26
|
+
}
|
|
27
|
+
},
|
|
28
|
+
quoteFieldNameOrPosition(f) {
|
|
29
|
+
if (typeof f === 'string' && f.length) {
|
|
30
|
+
return `"${f
|
|
31
|
+
.replace(/^\s*"*/, '')
|
|
32
|
+
.replace(/"*\s*$/, '')
|
|
33
|
+
.replace(/"/g, '""')}"`;
|
|
34
|
+
}
|
|
35
|
+
else if (typeof f === 'number') {
|
|
36
|
+
if (!Number.isInteger(f) || f < 1)
|
|
37
|
+
throw new Error(`Invalid field: ${f}`);
|
|
38
|
+
return '' + f;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
throw new Error(`Invalid field: ${f}`);
|
|
42
|
+
}
|
|
43
|
+
},
|
|
18
44
|
processQueryFields(options) {
|
|
19
45
|
let s = options && options.distinct ? ' DISTINCT ' : ' ';
|
|
20
46
|
if (options && options.fields) {
|
|
21
47
|
if (Array.isArray(options.fields)) {
|
|
22
|
-
return s + options.fields.map(exports.pgUtils.
|
|
48
|
+
return s + options.fields.map(exports.pgUtils.quoteFieldNameInsecure).join(', ');
|
|
23
49
|
}
|
|
24
50
|
else {
|
|
25
51
|
return s + options.fields;
|
|
@@ -66,33 +92,45 @@ exports.pgUtils = {
|
|
|
66
92
|
let sql = '';
|
|
67
93
|
if (options.groupBy) {
|
|
68
94
|
if (Array.isArray(options.groupBy)) {
|
|
69
|
-
sql += ' GROUP BY ' + options.groupBy.map(exports.pgUtils.
|
|
95
|
+
sql += ' GROUP BY ' + options.groupBy.map(exports.pgUtils.quoteFieldNameOrPosition).join(',');
|
|
70
96
|
}
|
|
71
97
|
else {
|
|
72
|
-
sql += ' GROUP BY ' + exports.pgUtils.
|
|
98
|
+
sql += ' GROUP BY ' + exports.pgUtils.quoteFieldNameOrPosition(options.groupBy);
|
|
73
99
|
}
|
|
74
100
|
}
|
|
75
101
|
if (options.orderBy) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
102
|
+
let orderBy = typeof options.orderBy === 'string' ? options.orderBy.split(',') : options.orderBy;
|
|
103
|
+
if (Array.isArray(orderBy)) {
|
|
104
|
+
let orderBy2 = orderBy.map(v => {
|
|
105
|
+
var _a;
|
|
106
|
+
if (typeof v === 'number')
|
|
107
|
+
return exports.pgUtils.quoteFieldNameOrPosition(v);
|
|
108
|
+
else if (typeof v !== 'string' || !v.length)
|
|
109
|
+
throw new Error(`Invalid orderBy: ${v}`);
|
|
110
|
+
if (v[0] == '+')
|
|
111
|
+
return exports.pgUtils.quoteFieldNameOrPosition(v.slice(1));
|
|
112
|
+
if (v[0] == '-')
|
|
113
|
+
return exports.pgUtils.quoteFieldNameOrPosition(v.slice(1)) + ' desc';
|
|
114
|
+
let o = ASC_DESC_REGEXP.exec(v);
|
|
115
|
+
if (!o)
|
|
116
|
+
throw new Error(`Invalid orderBy: ${v}`);
|
|
117
|
+
return `${exports.pgUtils.quoteFieldNameOrPosition(o[1])} ${(_a = o[2]) !== null && _a !== void 0 ? _a : ''}`;
|
|
118
|
+
});
|
|
119
|
+
sql += ' ORDER BY ' + orderBy2.join(',');
|
|
84
120
|
}
|
|
85
121
|
else {
|
|
86
|
-
|
|
87
|
-
_.forEach(options.orderBy, (v, k) => orderBy.push(exports.pgUtils.quoteField(k) + ' ' + v));
|
|
88
|
-
sql += ' ORDER BY ' + orderBy.join(',');
|
|
122
|
+
throw new Error(`Invalid orderBy: ${options.orderBy}`);
|
|
89
123
|
}
|
|
90
124
|
}
|
|
91
125
|
if (options.limit) {
|
|
92
|
-
|
|
126
|
+
if (!Number.isInteger(options.limit) || options.limit < 0)
|
|
127
|
+
throw new Error(`Invalid limit: ${options.limit}`);
|
|
128
|
+
sql += ` LIMIT ${options.limit}`;
|
|
93
129
|
}
|
|
94
130
|
if (options.offset) {
|
|
95
|
-
|
|
131
|
+
if (!Number.isInteger(options.offset) || options.offset < 0)
|
|
132
|
+
throw new Error(`Invalid offset: ${options.offset}`);
|
|
133
|
+
sql += ` OFFSET ${options.offset}`;
|
|
96
134
|
}
|
|
97
135
|
if (options.forUpdate) {
|
|
98
136
|
sql += ' FOR UPDATE';
|
|
@@ -107,7 +145,7 @@ exports.pgUtils = {
|
|
|
107
145
|
if (res) {
|
|
108
146
|
if (res[0] && !Array.isArray(res[0])) {
|
|
109
147
|
if (Object.keys(res[0]).length != fields.length) {
|
|
110
|
-
throw Error("Name collision for the query, two or more fields have the same name.");
|
|
148
|
+
throw new Error("Name collision for the query, two or more fields have the same name.");
|
|
111
149
|
}
|
|
112
150
|
}
|
|
113
151
|
exports.pgUtils.convertTypes(res, fields, pgdbTypeParsers);
|
|
@@ -138,13 +176,13 @@ exports.pgUtils = {
|
|
|
138
176
|
if (fn.return_single_value) {
|
|
139
177
|
let keys = res[0] ? Object.keys(res[0]) : [];
|
|
140
178
|
if (keys.length != 1) {
|
|
141
|
-
throw Error(`Return type error. schema: ${fn.schema} fn: ${fn.name} expected return type: single value, current value:` + JSON.stringify(res));
|
|
179
|
+
throw new Error(`Return type error. schema: ${fn.schema} fn: ${fn.name} expected return type: single value, current value:` + JSON.stringify(res));
|
|
142
180
|
}
|
|
143
181
|
res = res.map((r) => r[keys[0]]);
|
|
144
182
|
}
|
|
145
183
|
if (fn.return_single_row) {
|
|
146
184
|
if (res.length != 1) {
|
|
147
|
-
throw Error(`Return type error. schema: ${fn.schema} fn: ${fn.name} expected return type: single value, current value:` + JSON.stringify(res));
|
|
185
|
+
throw new Error(`Return type error. schema: ${fn.schema} fn: ${fn.name} expected return type: single value, current value:` + JSON.stringify(res));
|
|
148
186
|
}
|
|
149
187
|
return res[0];
|
|
150
188
|
}
|
package/lib/pgUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pgUtils.js","sourceRoot":"","sources":["../src/pgUtils.ts"],"names":[],"mappings":";;;;AACA,iCAAiC;
|
|
1
|
+
{"version":3,"file":"pgUtils.js","sourceRoot":"","sources":["../src/pgUtils.ts"],"names":[],"mappings":"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"}
|
package/lib/queryAble.d.ts
CHANGED
|
@@ -41,10 +41,22 @@ export interface PgRowResult {
|
|
|
41
41
|
columns: string[];
|
|
42
42
|
rows: any[];
|
|
43
43
|
}
|
|
44
|
+
export declare type PostProcessResultFunc = (res: any[], fields: ResultFieldType[], logger: PgDbLogger) => void;
|
|
45
|
+
export interface IPgDb {
|
|
46
|
+
connection: any;
|
|
47
|
+
pool: any;
|
|
48
|
+
pgdbTypeParsers: any;
|
|
49
|
+
knownOids: Record<number, boolean>;
|
|
50
|
+
runRestartConnectionForListen(): Promise<Error>;
|
|
51
|
+
needToFixConnectionForListen(): boolean;
|
|
52
|
+
postProcessResult: PostProcessResultFunc;
|
|
53
|
+
resetMissingParsers(connection: any, oidList: number[]): Promise<void>;
|
|
54
|
+
}
|
|
44
55
|
export declare class QueryAble {
|
|
45
|
-
db:
|
|
56
|
+
db: IPgDb & QueryAble;
|
|
46
57
|
schema: any;
|
|
47
58
|
protected logger: PgDbLogger;
|
|
59
|
+
static connectionErrorListener: () => void;
|
|
48
60
|
constructor();
|
|
49
61
|
setLogger(logger: PgDbLogger): void;
|
|
50
62
|
getLogger(useConsoleAsDefault?: boolean): any;
|
|
@@ -70,4 +82,7 @@ export declare class QueryAble {
|
|
|
70
82
|
queryFirst(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any>;
|
|
71
83
|
queryOneField(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any>;
|
|
72
84
|
queryOneColumn(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any[]>;
|
|
85
|
+
private postProcessFields;
|
|
86
|
+
private checkAndFixOids;
|
|
87
|
+
private hasUnknownOids;
|
|
73
88
|
}
|
package/lib/queryAble.js
CHANGED
|
@@ -33,6 +33,9 @@ class QueryAble {
|
|
|
33
33
|
}
|
|
34
34
|
internalQuery(options) {
|
|
35
35
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
|
+
if (this.db.needToFixConnectionForListen()) {
|
|
37
|
+
yield this.db.runRestartConnectionForListen();
|
|
38
|
+
}
|
|
36
39
|
let { connection, sql, params, logger } = options;
|
|
37
40
|
logger = logger || this.getLogger(false);
|
|
38
41
|
try {
|
|
@@ -44,39 +47,33 @@ class QueryAble {
|
|
|
44
47
|
if (connection) {
|
|
45
48
|
logger.log('reused connection', sql, util.inspect(params, false, null), connection.processID);
|
|
46
49
|
let res = yield connection.query({ text: sql, values: params, rowMode: (options === null || options === void 0 ? void 0 : options.rowMode) ? 'array' : undefined });
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
this.db.postProcessResult(res.rows, res.fields, logger);
|
|
50
|
+
yield this.checkAndFixOids(connection, res.fields);
|
|
51
|
+
this.postProcessFields(res.rows, res.fields, logger);
|
|
50
52
|
return (options === null || options === void 0 ? void 0 : options.rowMode) ? { columns: (res.fields || []).map(f => f.name), rows: res.rows || [] } : res.rows;
|
|
51
53
|
}
|
|
52
54
|
else {
|
|
53
55
|
connection = yield this.db.pool.connect();
|
|
54
56
|
logger.log('new connection', sql, util.inspect(params, false, null), connection.processID);
|
|
57
|
+
connection.on('error', QueryAble.connectionErrorListener);
|
|
58
|
+
let res = yield connection.query({ text: sql, values: params, rowMode: (options === null || options === void 0 ? void 0 : options.rowMode) ? 'array' : undefined });
|
|
59
|
+
yield this.checkAndFixOids(connection, res.fields);
|
|
60
|
+
connection.off('error', QueryAble.connectionErrorListener);
|
|
61
|
+
connection.release();
|
|
62
|
+
connection = null;
|
|
63
|
+
this.postProcessFields(res.rows, res.fields, logger);
|
|
64
|
+
return (options === null || options === void 0 ? void 0 : options.rowMode) ? { columns: (res.fields || []).map(f => f.name), rows: res.rows || [] } : res.rows;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
catch (e) {
|
|
68
|
+
pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
|
|
69
|
+
if (connection) {
|
|
55
70
|
try {
|
|
56
|
-
let res = yield connection.query({ text: sql, values: params, rowMode: (options === null || options === void 0 ? void 0 : options.rowMode) ? 'array' : undefined });
|
|
57
71
|
connection.release();
|
|
58
|
-
connection = null;
|
|
59
|
-
pgUtils_1.pgUtils.postProcessResult(res.rows, res.fields, this.db.pgdbTypeParsers);
|
|
60
|
-
if (this.db.postProcessResult)
|
|
61
|
-
this.db.postProcessResult(res.rows, res.fields, logger);
|
|
62
|
-
return (options === null || options === void 0 ? void 0 : options.rowMode) ? { columns: (res.fields || []).map(f => f.name), rows: res.rows || [] } : res.rows;
|
|
63
72
|
}
|
|
64
73
|
catch (e) {
|
|
65
|
-
|
|
66
|
-
try {
|
|
67
|
-
if (connection)
|
|
68
|
-
connection.release();
|
|
69
|
-
}
|
|
70
|
-
catch (e) {
|
|
71
|
-
logger.error('connection error2', e.message);
|
|
72
|
-
}
|
|
73
|
-
connection = null;
|
|
74
|
-
throw e;
|
|
74
|
+
logger.error('connection error', e.message);
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
|
-
}
|
|
78
|
-
catch (e) {
|
|
79
|
-
pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
|
|
80
77
|
throw e;
|
|
81
78
|
}
|
|
82
79
|
});
|
|
@@ -90,90 +87,122 @@ class QueryAble {
|
|
|
90
87
|
}
|
|
91
88
|
queryWithOnCursorCallback(sql, params, options, callback) {
|
|
92
89
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
if (this.db.needToFixConnectionForListen()) {
|
|
91
|
+
yield this.db.runRestartConnectionForListen();
|
|
92
|
+
}
|
|
93
93
|
let connection = this.db.connection;
|
|
94
|
+
let logger = this.getLogger(true);
|
|
94
95
|
try {
|
|
95
96
|
if (params && !Array.isArray(params)) {
|
|
96
97
|
let p = pgUtils_1.pgUtils.processNamedParams(sql, params);
|
|
97
98
|
sql = p.sql;
|
|
98
99
|
params = p.params;
|
|
99
100
|
}
|
|
100
|
-
|
|
101
|
+
let queryInternal = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
101
102
|
this.getLogger(false).log(sql, util.inspect(params, false, null), connection.processID);
|
|
103
|
+
let fieldsToFix;
|
|
104
|
+
let isFirst = true;
|
|
102
105
|
let query = new QueryStream(sql, params);
|
|
103
106
|
let stream = connection.query(query);
|
|
104
107
|
yield new Promise((resolve, reject) => {
|
|
108
|
+
query.handleError = (err, connection) => {
|
|
109
|
+
reject(err);
|
|
110
|
+
};
|
|
105
111
|
stream.on('data', (res) => {
|
|
106
112
|
try {
|
|
107
113
|
let fields = stream._result && stream._result.fields || stream.cursor._result && stream.cursor._result.fields;
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
114
|
+
if (isFirst) {
|
|
115
|
+
if (this.hasUnknownOids(fields)) {
|
|
116
|
+
fieldsToFix = fields;
|
|
117
|
+
stream.destroy();
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
isFirst = false;
|
|
121
|
+
}
|
|
122
|
+
this.postProcessFields([res], fields, this.getLogger(false));
|
|
111
123
|
if (callback(res)) {
|
|
112
|
-
stream.
|
|
124
|
+
stream.destroy();
|
|
113
125
|
}
|
|
114
126
|
}
|
|
115
127
|
catch (e) {
|
|
116
128
|
reject(e);
|
|
117
129
|
}
|
|
118
130
|
});
|
|
119
|
-
stream.on('
|
|
131
|
+
stream.on('close', resolve);
|
|
120
132
|
stream.on('error', reject);
|
|
121
133
|
});
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
this.getLogger(false).log(sql, util.inspect(params, false, null), connection.processID);
|
|
127
|
-
let query = new QueryStream(sql, params);
|
|
128
|
-
let stream = connection.query(query);
|
|
134
|
+
if (fieldsToFix) {
|
|
135
|
+
yield this.checkAndFixOids(connection, fieldsToFix);
|
|
136
|
+
query = new QueryStream(sql, params);
|
|
137
|
+
stream = connection.query(query);
|
|
129
138
|
yield new Promise((resolve, reject) => {
|
|
139
|
+
query.handleError = (err, connection) => {
|
|
140
|
+
reject(err);
|
|
141
|
+
};
|
|
130
142
|
stream.on('data', (res) => {
|
|
131
143
|
try {
|
|
132
144
|
let fields = stream._result && stream._result.fields || stream.cursor._result && stream.cursor._result.fields;
|
|
133
|
-
|
|
134
|
-
if (this.db.postProcessResult)
|
|
135
|
-
this.db.postProcessResult([res], fields, this.getLogger(false));
|
|
145
|
+
this.postProcessFields([res], fields, this.getLogger(false));
|
|
136
146
|
if (callback(res)) {
|
|
137
|
-
stream.
|
|
147
|
+
stream.destroy();
|
|
138
148
|
}
|
|
139
149
|
}
|
|
140
150
|
catch (e) {
|
|
141
151
|
reject(e);
|
|
142
152
|
}
|
|
143
153
|
});
|
|
144
|
-
stream.on('
|
|
154
|
+
stream.on('close', resolve);
|
|
145
155
|
stream.on('error', reject);
|
|
146
156
|
});
|
|
147
157
|
}
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
158
|
+
});
|
|
159
|
+
if (connection) {
|
|
160
|
+
yield queryInternal();
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
163
|
+
connection = yield this.db.pool.connect();
|
|
164
|
+
logger.log('new connection', sql, util.inspect(params, false, null), connection.processID);
|
|
165
|
+
connection.on('error', QueryAble.connectionErrorListener);
|
|
166
|
+
yield queryInternal();
|
|
167
|
+
connection.off('error', QueryAble.connectionErrorListener);
|
|
168
|
+
connection.release();
|
|
169
|
+
connection = null;
|
|
156
170
|
}
|
|
157
171
|
}
|
|
158
172
|
catch (e) {
|
|
159
|
-
let logger = this.getLogger(true);
|
|
160
173
|
pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
|
|
174
|
+
if (connection) {
|
|
175
|
+
try {
|
|
176
|
+
connection.release();
|
|
177
|
+
}
|
|
178
|
+
catch (e) {
|
|
179
|
+
logger.error('connection error', e.message);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
161
182
|
throw e;
|
|
162
183
|
}
|
|
163
184
|
});
|
|
164
185
|
}
|
|
165
186
|
queryAsStream(sql, params, options) {
|
|
166
187
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
188
|
+
if (this.db.needToFixConnectionForListen()) {
|
|
189
|
+
yield this.db.runRestartConnectionForListen();
|
|
190
|
+
}
|
|
167
191
|
let connection = this.db.connection;
|
|
168
192
|
let logger = (options && options.logger || this.getLogger(false));
|
|
169
193
|
let pgStream;
|
|
170
|
-
let
|
|
194
|
+
let queriable = this;
|
|
195
|
+
let isFirst = true;
|
|
171
196
|
let convertTypeFilter = through(function (data) {
|
|
172
197
|
try {
|
|
173
198
|
let fields = pgStream._result && pgStream._result.fields || pgStream.cursor._result && pgStream.cursor._result.fields;
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
199
|
+
if (isFirst) {
|
|
200
|
+
if (queriable.hasUnknownOids(fields)) {
|
|
201
|
+
throw new Error('[337] Query returns fields with unknown oid.');
|
|
202
|
+
}
|
|
203
|
+
isFirst = false;
|
|
204
|
+
}
|
|
205
|
+
queriable.postProcessFields([data], fields, queriable.db.pgdbTypeParsers);
|
|
177
206
|
this.emit('data', data);
|
|
178
207
|
}
|
|
179
208
|
catch (err) {
|
|
@@ -181,6 +210,15 @@ class QueryAble {
|
|
|
181
210
|
}
|
|
182
211
|
});
|
|
183
212
|
convertTypeFilter.on('error', (e) => {
|
|
213
|
+
if (connection) {
|
|
214
|
+
try {
|
|
215
|
+
connection.release();
|
|
216
|
+
}
|
|
217
|
+
catch (e) {
|
|
218
|
+
logger.error('connection error', e.message);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
connection = null;
|
|
184
222
|
pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
|
|
185
223
|
});
|
|
186
224
|
try {
|
|
@@ -192,23 +230,34 @@ class QueryAble {
|
|
|
192
230
|
if (connection) {
|
|
193
231
|
logger.log(sql, util.inspect(params, false, null), connection.processID);
|
|
194
232
|
let query = new QueryStream(sql, params);
|
|
233
|
+
query.handleError = (err, connection) => {
|
|
234
|
+
convertTypeFilter.emit('error', err);
|
|
235
|
+
};
|
|
195
236
|
pgStream = connection.query(query);
|
|
196
237
|
return pgStream.pipe(convertTypeFilter);
|
|
197
238
|
}
|
|
198
239
|
else {
|
|
199
240
|
connection = yield this.db.pool.connect();
|
|
200
|
-
logger.log(sql, util.inspect(params, false, null), connection.processID);
|
|
241
|
+
logger.log('new connection', sql, util.inspect(params, false, null), connection.processID);
|
|
242
|
+
connection.on('error', QueryAble.connectionErrorListener);
|
|
201
243
|
let query = new QueryStream(sql, params);
|
|
244
|
+
query.handleError = (err, connection) => {
|
|
245
|
+
convertTypeFilter.emit('error', err);
|
|
246
|
+
};
|
|
202
247
|
pgStream = connection.query(query);
|
|
203
248
|
pgStream.on('close', () => {
|
|
204
|
-
if (connection)
|
|
249
|
+
if (connection) {
|
|
250
|
+
connection.off('error', QueryAble.connectionErrorListener);
|
|
205
251
|
connection.release();
|
|
252
|
+
}
|
|
206
253
|
connection = null;
|
|
207
254
|
});
|
|
208
255
|
pgStream.on('error', (e) => {
|
|
209
256
|
pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
|
|
210
|
-
if (connection)
|
|
257
|
+
if (connection) {
|
|
258
|
+
connection.off('error', QueryAble.connectionErrorListener);
|
|
211
259
|
connection.release();
|
|
260
|
+
}
|
|
212
261
|
connection = null;
|
|
213
262
|
});
|
|
214
263
|
return pgStream.pipe(convertTypeFilter);
|
|
@@ -264,6 +313,25 @@ class QueryAble {
|
|
|
264
313
|
return res.map(r => r[fieldName]);
|
|
265
314
|
});
|
|
266
315
|
}
|
|
316
|
+
postProcessFields(rows, fields, logger) {
|
|
317
|
+
pgUtils_1.pgUtils.postProcessResult(rows, fields, this.db.pgdbTypeParsers);
|
|
318
|
+
if (this.db.postProcessResult)
|
|
319
|
+
this.db.postProcessResult(rows, fields, logger);
|
|
320
|
+
}
|
|
321
|
+
checkAndFixOids(connection, fields) {
|
|
322
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
323
|
+
if (fields) {
|
|
324
|
+
let oidList = fields.map(field => field.dataTypeID);
|
|
325
|
+
return this.db.resetMissingParsers(connection, oidList);
|
|
326
|
+
}
|
|
327
|
+
});
|
|
328
|
+
}
|
|
329
|
+
hasUnknownOids(fields) {
|
|
330
|
+
let oidList = fields.map(field => field.dataTypeID);
|
|
331
|
+
let unknownOids = oidList.filter(oid => !this.db.knownOids[oid]);
|
|
332
|
+
return !!unknownOids.length;
|
|
333
|
+
}
|
|
267
334
|
}
|
|
268
335
|
exports.QueryAble = QueryAble;
|
|
336
|
+
QueryAble.connectionErrorListener = () => { };
|
|
269
337
|
//# sourceMappingURL=queryAble.js.map
|