callman-core 1.43.0 → 1.45.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.
- package/dist/ai/prompts/diagram.d.ts.map +1 -1
- package/dist/ai/prompts/diagram.js +10 -5
- package/dist/ai/prompts/diagram.js.map +1 -1
- package/dist/ai/prompts/scenarioNodeReference.d.ts.map +1 -1
- package/dist/ai/prompts/scenarioNodeReference.js +17 -6
- package/dist/ai/prompts/scenarioNodeReference.js.map +1 -1
- package/dist/diagram/geometry.d.ts +1 -0
- package/dist/diagram/geometry.d.ts.map +1 -1
- package/dist/diagram/geometry.js +15 -0
- package/dist/diagram/geometry.js.map +1 -1
- package/dist/diagram/ops.d.ts.map +1 -1
- package/dist/diagram/ops.js +25 -12
- package/dist/diagram/ops.js.map +1 -1
- package/dist/diagram/routing/batch.d.ts +2 -0
- package/dist/diagram/routing/batch.d.ts.map +1 -1
- package/dist/diagram/routing/batch.js +4 -4
- package/dist/diagram/routing/batch.js.map +1 -1
- package/dist/diagram/routing/index.d.ts +1 -0
- package/dist/diagram/routing/index.d.ts.map +1 -1
- package/dist/diagram/routing/index.js +1 -0
- package/dist/diagram/routing/index.js.map +1 -1
- package/dist/diagram/routing/ports.d.ts +14 -0
- package/dist/diagram/routing/ports.d.ts.map +1 -0
- package/dist/diagram/routing/ports.js +130 -0
- package/dist/diagram/routing/ports.js.map +1 -0
- package/dist/diagram/routing/sides.d.ts.map +1 -1
- package/dist/diagram/routing/sides.js +4 -3
- package/dist/diagram/routing/sides.js.map +1 -1
- package/dist/diagram/routing/types.d.ts +1 -0
- package/dist/diagram/routing/types.d.ts.map +1 -1
- package/dist/diagram/routing/types.js.map +1 -1
- package/dist/host/connections.d.ts.map +1 -1
- package/dist/host/connections.js +7 -0
- package/dist/host/connections.js.map +1 -1
- package/dist/host/db/db-query-reference.d.ts.map +1 -1
- package/dist/host/db/db-query-reference.js +22 -5
- package/dist/host/db/db-query-reference.js.map +1 -1
- package/dist/host/db/dbBinds.d.ts +20 -0
- package/dist/host/db/dbBinds.d.ts.map +1 -0
- package/dist/host/db/dbBinds.js +61 -0
- package/dist/host/db/dbBinds.js.map +1 -0
- package/dist/host/db/dbSessionManager.d.ts +13 -0
- package/dist/host/db/dbSessionManager.d.ts.map +1 -0
- package/dist/host/db/dbSessionManager.js +165 -0
- package/dist/host/db/dbSessionManager.js.map +1 -0
- package/dist/host/db/introspection/index.d.ts +1 -0
- package/dist/host/db/introspection/index.d.ts.map +1 -1
- package/dist/host/db/introspection/index.js +1 -0
- package/dist/host/db/introspection/index.js.map +1 -1
- package/dist/host/db/introspection/routines.d.ts +38 -0
- package/dist/host/db/introspection/routines.d.ts.map +1 -0
- package/dist/host/db/introspection/routines.js +439 -0
- package/dist/host/db/introspection/routines.js.map +1 -0
- package/dist/host/db/mssqlAdapter.d.ts +10 -4
- package/dist/host/db/mssqlAdapter.d.ts.map +1 -1
- package/dist/host/db/mssqlAdapter.js +144 -34
- package/dist/host/db/mssqlAdapter.js.map +1 -1
- package/dist/host/db/mysqlAdapter.d.ts +10 -4
- package/dist/host/db/mysqlAdapter.d.ts.map +1 -1
- package/dist/host/db/mysqlAdapter.js +66 -16
- package/dist/host/db/mysqlAdapter.js.map +1 -1
- package/dist/host/db/oracleAdapter.d.ts +10 -4
- package/dist/host/db/oracleAdapter.d.ts.map +1 -1
- package/dist/host/db/oracleAdapter.js +301 -28
- package/dist/host/db/oracleAdapter.js.map +1 -1
- package/dist/host/db/pgClientConfig.d.ts +10 -1
- package/dist/host/db/pgClientConfig.d.ts.map +1 -1
- package/dist/host/db/pgClientConfig.js +59 -0
- package/dist/host/db/pgClientConfig.js.map +1 -1
- package/dist/host/db/pgSession.d.ts +11 -0
- package/dist/host/db/pgSession.d.ts.map +1 -0
- package/dist/host/db/pgSession.js +62 -0
- package/dist/host/db/pgSession.js.map +1 -0
- package/dist/host/db/pgSessionManager.d.ts +5 -14
- package/dist/host/db/pgSessionManager.d.ts.map +1 -1
- package/dist/host/db/pgSessionManager.js +9 -161
- package/dist/host/db/pgSessionManager.js.map +1 -1
- package/dist/host/db/postgresAdapter.d.ts +2 -4
- package/dist/host/db/postgresAdapter.d.ts.map +1 -1
- package/dist/host/db/postgresAdapter.js +26 -6
- package/dist/host/db/postgresAdapter.js.map +1 -1
- package/dist/host/db/queryExecutor.d.ts +2 -4
- package/dist/host/db/queryExecutor.d.ts.map +1 -1
- package/dist/host/db/queryExecutor.js +35 -23
- package/dist/host/db/queryExecutor.js.map +1 -1
- package/dist/host/db/sqlState.d.ts +1 -0
- package/dist/host/db/sqlState.d.ts.map +1 -1
- package/dist/host/db/sqlState.js +20 -0
- package/dist/host/db/sqlState.js.map +1 -1
- package/dist/host/db/types.d.ts +38 -0
- package/dist/host/db/types.d.ts.map +1 -1
- package/dist/host/index.d.ts +5 -3
- package/dist/host/index.d.ts.map +1 -1
- package/dist/host/index.js +8 -6
- package/dist/host/index.js.map +1 -1
- package/dist/scenario-runner/adapters/db-executor.d.ts +17 -3
- package/dist/scenario-runner/adapters/db-executor.d.ts.map +1 -1
- package/dist/scenario-runner/adapters/db-executor.js +57 -22
- package/dist/scenario-runner/adapters/db-executor.js.map +1 -1
- package/dist/scenario-runner/adapters/index.d.ts +1 -1
- package/dist/scenario-runner/adapters/index.d.ts.map +1 -1
- package/dist/scenario-runner/adapters/index.js +1 -1
- package/dist/scenario-runner/adapters/index.js.map +1 -1
- package/dist/scenario-runner/adapters/types.d.ts +7 -0
- package/dist/scenario-runner/adapters/types.d.ts.map +1 -1
- package/dist/scenario-runner/index.d.ts +1 -1
- package/dist/scenario-runner/index.d.ts.map +1 -1
- package/dist/scenario-runner/index.js +1 -1
- package/dist/scenario-runner/index.js.map +1 -1
- package/dist/scenario-runner/nodePolicy.d.ts.map +1 -1
- package/dist/scenario-runner/nodePolicy.js +3 -0
- package/dist/scenario-runner/nodePolicy.js.map +1 -1
- package/dist/scenario-runner/runScenario.d.ts +4 -2
- package/dist/scenario-runner/runScenario.d.ts.map +1 -1
- package/dist/scenario-runner/runScenario.js +47 -12
- package/dist/scenario-runner/runScenario.js.map +1 -1
- package/dist/scenario-runner/runScenarioWithDataset.d.ts.map +1 -1
- package/dist/scenario-runner/runScenarioWithDataset.js +65 -1
- package/dist/scenario-runner/runScenarioWithDataset.js.map +1 -1
- package/dist/scenario-runner/types.d.ts +21 -1
- package/dist/scenario-runner/types.d.ts.map +1 -1
- package/dist/script/features/db.d.ts +7 -0
- package/dist/script/features/db.d.ts.map +1 -1
- package/dist/script/features/db.js +8 -1
- package/dist/script/features/db.js.map +1 -1
- package/dist/script/pm-api-declarations.d.ts.map +1 -1
- package/dist/script/pm-api-declarations.js +24 -0
- package/dist/script/pm-api-declarations.js.map +1 -1
- package/dist/script/pm-api-metadata.js +1 -1
- package/dist/script/pm-api-metadata.js.map +1 -1
- package/dist/script/types.d.ts +7 -0
- package/dist/script/types.d.ts.map +1 -1
- package/dist-cjs/ai/prompts/diagram.js +10 -5
- package/dist-cjs/ai/prompts/diagram.js.map +1 -1
- package/dist-cjs/ai/prompts/scenarioNodeReference.js +17 -6
- package/dist-cjs/ai/prompts/scenarioNodeReference.js.map +1 -1
- package/dist-cjs/diagram/geometry.js +17 -1
- package/dist-cjs/diagram/geometry.js.map +1 -1
- package/dist-cjs/diagram/ops.js +25 -12
- package/dist-cjs/diagram/ops.js.map +1 -1
- package/dist-cjs/diagram/routing/batch.js +4 -4
- package/dist-cjs/diagram/routing/batch.js.map +1 -1
- package/dist-cjs/diagram/routing/index.js +1 -0
- package/dist-cjs/diagram/routing/index.js.map +1 -1
- package/dist-cjs/diagram/routing/ports.js +135 -0
- package/dist-cjs/diagram/routing/ports.js.map +1 -0
- package/dist-cjs/diagram/routing/sides.js +3 -2
- package/dist-cjs/diagram/routing/sides.js.map +1 -1
- package/dist-cjs/diagram/routing/types.js.map +1 -1
- package/dist-cjs/host/connections.js +7 -0
- package/dist-cjs/host/connections.js.map +1 -1
- package/dist-cjs/host/db/db-query-reference.js +22 -5
- package/dist-cjs/host/db/db-query-reference.js.map +1 -1
- package/dist-cjs/host/db/dbBinds.js +71 -0
- package/dist-cjs/host/db/dbBinds.js.map +1 -0
- package/dist-cjs/host/db/dbSessionManager.js +172 -0
- package/dist-cjs/host/db/dbSessionManager.js.map +1 -0
- package/dist-cjs/host/db/introspection/index.js +4 -1
- package/dist-cjs/host/db/introspection/index.js.map +1 -1
- package/dist-cjs/host/db/introspection/routines.js +444 -0
- package/dist-cjs/host/db/introspection/routines.js.map +1 -0
- package/dist-cjs/host/db/mssqlAdapter.js +146 -35
- package/dist-cjs/host/db/mssqlAdapter.js.map +1 -1
- package/dist-cjs/host/db/mysqlAdapter.js +68 -17
- package/dist-cjs/host/db/mysqlAdapter.js.map +1 -1
- package/dist-cjs/host/db/oracleAdapter.js +303 -29
- package/dist-cjs/host/db/oracleAdapter.js.map +1 -1
- package/dist-cjs/host/db/pgClientConfig.js +61 -1
- package/dist-cjs/host/db/pgClientConfig.js.map +1 -1
- package/dist-cjs/host/db/pgSession.js +67 -0
- package/dist-cjs/host/db/pgSession.js.map +1 -0
- package/dist-cjs/host/db/pgSessionManager.js +10 -166
- package/dist-cjs/host/db/pgSessionManager.js.map +1 -1
- package/dist-cjs/host/db/postgresAdapter.js +25 -5
- package/dist-cjs/host/db/postgresAdapter.js.map +1 -1
- package/dist-cjs/host/db/queryExecutor.js +34 -22
- package/dist-cjs/host/db/queryExecutor.js.map +1 -1
- package/dist-cjs/host/db/sqlState.js +22 -1
- package/dist-cjs/host/db/sqlState.js.map +1 -1
- package/dist-cjs/host/index.js +15 -6
- package/dist-cjs/host/index.js.map +1 -1
- package/dist-cjs/scenario-runner/adapters/db-executor.js +57 -21
- package/dist-cjs/scenario-runner/adapters/db-executor.js.map +1 -1
- package/dist-cjs/scenario-runner/adapters/index.js +3 -1
- package/dist-cjs/scenario-runner/adapters/index.js.map +1 -1
- package/dist-cjs/scenario-runner/index.js +2 -1
- package/dist-cjs/scenario-runner/index.js.map +1 -1
- package/dist-cjs/scenario-runner/nodePolicy.js +3 -0
- package/dist-cjs/scenario-runner/nodePolicy.js.map +1 -1
- package/dist-cjs/scenario-runner/runScenario.js +49 -13
- package/dist-cjs/scenario-runner/runScenario.js.map +1 -1
- package/dist-cjs/scenario-runner/runScenarioWithDataset.js +65 -1
- package/dist-cjs/scenario-runner/runScenarioWithDataset.js.map +1 -1
- package/dist-cjs/script/features/db.js +8 -1
- package/dist-cjs/script/features/db.js.map +1 -1
- package/dist-cjs/script/pm-api-declarations.js +24 -0
- package/dist-cjs/script/pm-api-declarations.js.map +1 -1
- package/dist-cjs/script/pm-api-metadata.js +1 -1
- package/dist-cjs/script/pm-api-metadata.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,8 +7,9 @@
|
|
|
7
7
|
// input `p{i+1}` — T-SQL has no `?` placeholders, and rewriting them inside
|
|
8
8
|
// the SQL text would risk corrupting string literals.
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.executeMssqlQuery = exports.testMssqlConnection = exports.withMssqlPool = exports.__setMssqlDriverForTests = void 0;
|
|
10
|
+
exports.executeMssqlQuery = exports.openMssqlSession = exports.testMssqlConnection = exports.withMssqlPool = exports.__setMssqlDriverForTests = void 0;
|
|
11
11
|
const lazy_js_1 = require("../lazy.js");
|
|
12
|
+
const dbBinds_js_1 = require("./dbBinds.js");
|
|
12
13
|
const sqlNormalize_js_1 = require("./sqlNormalize.js");
|
|
13
14
|
const dbTimings_js_1 = require("./dbTimings.js");
|
|
14
15
|
const dbPool_js_1 = require("./dbPool.js");
|
|
@@ -103,26 +104,141 @@ const testMssqlConnection = async (connection) => {
|
|
|
103
104
|
});
|
|
104
105
|
};
|
|
105
106
|
exports.testMssqlConnection = testMssqlConnection;
|
|
106
|
-
const
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
107
|
+
const mssqlBindType = (sql, bind) => {
|
|
108
|
+
switch (bind.type) {
|
|
109
|
+
case "int":
|
|
110
|
+
return sql.BigInt;
|
|
111
|
+
case "numeric":
|
|
112
|
+
return sql.Decimal(38, 10);
|
|
113
|
+
case "boolean":
|
|
114
|
+
return sql.Bit;
|
|
115
|
+
case "date":
|
|
116
|
+
return sql.Date;
|
|
117
|
+
case "timestamp":
|
|
118
|
+
return sql.DateTime2;
|
|
119
|
+
case "blob":
|
|
120
|
+
return sql.VarBinary(sql.MAX);
|
|
121
|
+
default:
|
|
122
|
+
return sql.NVarChar(sql.MAX);
|
|
123
|
+
}
|
|
124
|
+
};
|
|
125
|
+
const addMssqlBinds = (sql, request, options) => {
|
|
126
|
+
if (!options.binds) {
|
|
127
|
+
(options.params ?? []).forEach((value, index) => {
|
|
128
|
+
request.input(`p${index + 1}`, value);
|
|
129
|
+
});
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
options.binds.forEach((bind, index) => {
|
|
133
|
+
const name = bind.name?.trim().replace(/^@/, "") || `p${index + 1}`;
|
|
134
|
+
if (bind.direction === "out") {
|
|
135
|
+
request.output(name, mssqlBindType(sql, bind));
|
|
136
|
+
}
|
|
137
|
+
else if (bind.direction === "inout") {
|
|
138
|
+
request.output(name, mssqlBindType(sql, bind), bind.value ?? null);
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
request.input(name, bind.value ?? null);
|
|
142
|
+
}
|
|
110
143
|
});
|
|
111
|
-
const result = await request.query((0, sqlNormalize_js_1.stripTrailingSqlTerminator)(query, "mssql"));
|
|
112
|
-
const recordset = Array.isArray(result?.recordset) ? result.recordset : [];
|
|
113
|
-
if (recordset.length > 0 || result?.recordset) {
|
|
114
|
-
const rows = recordset.map(normalizeMssqlValue);
|
|
115
|
-
return { rows, rowCount: rows.length };
|
|
116
|
-
}
|
|
117
|
-
const affected = Array.isArray(result?.rowsAffected)
|
|
118
|
-
? result.rowsAffected.reduce((sum, count) => sum + count, 0)
|
|
119
|
-
: 0;
|
|
120
|
-
return { rows: [], rowCount: affected };
|
|
121
144
|
};
|
|
145
|
+
// `cancel()` is how a running T-SQL batch stops on the server; the driver's
|
|
146
|
+
// own requestTimeout is pool-wide and only sets the upper bound.
|
|
147
|
+
const runMssqlStatement = async (sql, pool, query, options) => {
|
|
148
|
+
const request = pool.request();
|
|
149
|
+
addMssqlBinds(sql, request, options);
|
|
150
|
+
const hasInputs = Boolean(options.binds?.length || options.params?.length);
|
|
151
|
+
const messages = [];
|
|
152
|
+
if (options.captureOutput) {
|
|
153
|
+
request.on?.("info", (info) => {
|
|
154
|
+
messages.push(info.message ?? "");
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
let timedOut = false;
|
|
158
|
+
const timer = options.timeoutMs && options.timeoutMs > 0
|
|
159
|
+
? setTimeout(() => {
|
|
160
|
+
timedOut = true;
|
|
161
|
+
request.cancel?.();
|
|
162
|
+
}, options.timeoutMs)
|
|
163
|
+
: null;
|
|
164
|
+
const detachAbort = (0, dbBinds_js_1.onDbAbort)(options.signal, () => request.cancel?.());
|
|
165
|
+
try {
|
|
166
|
+
// `query` runs through sp_executesql, whose scope ends with the call. In a
|
|
167
|
+
// session a statement without inputs goes as a raw batch, so a temp table or
|
|
168
|
+
// an opened transaction it creates outlives it.
|
|
169
|
+
const finalQuery = (0, sqlNormalize_js_1.stripTrailingSqlTerminator)(query, "mssql");
|
|
170
|
+
const result = options.preferBatch && !hasInputs ? await request.batch(finalQuery) : await request.query(finalQuery);
|
|
171
|
+
const recordset = Array.isArray(result?.recordset) ? result.recordset : [];
|
|
172
|
+
const hasRows = recordset.length > 0 || Boolean(result?.recordset);
|
|
173
|
+
const rows = hasRows ? recordset.map(normalizeMssqlValue) : [];
|
|
174
|
+
const affected = Array.isArray(result?.rowsAffected)
|
|
175
|
+
? result.rowsAffected.reduce((sum, count) => sum + count, 0)
|
|
176
|
+
: 0;
|
|
177
|
+
const recordsets = Array.isArray(result?.recordsets) ? result.recordsets : [];
|
|
178
|
+
const out = {};
|
|
179
|
+
for (const [index, bind] of (options.binds ?? []).entries()) {
|
|
180
|
+
if (bind.direction !== "out" && bind.direction !== "inout")
|
|
181
|
+
continue;
|
|
182
|
+
const name = (0, dbBinds_js_1.outBindName)(bind, index).replace(/^@/, "");
|
|
183
|
+
out[name] = normalizeMssqlValue(result?.output?.[name]);
|
|
184
|
+
}
|
|
185
|
+
return (0, dbBinds_js_1.finishStatementResult)({
|
|
186
|
+
rows,
|
|
187
|
+
rowCount: hasRows ? rows.length : affected,
|
|
188
|
+
out,
|
|
189
|
+
...(options.captureOutput ? { output: messages } : {}),
|
|
190
|
+
...(recordsets.length > 1
|
|
191
|
+
? { resultSets: recordsets.map((set) => set.map(normalizeMssqlValue)) }
|
|
192
|
+
: {}),
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
catch (error) {
|
|
196
|
+
(0, dbBinds_js_1.attachDbOutput)(error, options.captureOutput ? messages : undefined);
|
|
197
|
+
if (timedOut) {
|
|
198
|
+
throw new dbBinds_js_1.DbStatementTimeoutError(options.timeoutMs ?? 0, error instanceof Error ? error.message : String(error));
|
|
199
|
+
}
|
|
200
|
+
throw error;
|
|
201
|
+
}
|
|
202
|
+
finally {
|
|
203
|
+
detachAbort();
|
|
204
|
+
if (timer)
|
|
205
|
+
clearTimeout(timer);
|
|
206
|
+
}
|
|
207
|
+
};
|
|
208
|
+
const LONG_REQUEST_TIMEOUT_MS = 2 * 60 * 60 * 1000;
|
|
209
|
+
// A dedicated single-connection pool for a run's session: with one connection
|
|
210
|
+
// BEGIN TRANSACTION, temp tables and SET options survive between nodes.
|
|
211
|
+
const openMssqlSession = async (connection) => {
|
|
212
|
+
const sql = await loadMssqlDriver();
|
|
213
|
+
const pool = new sql.ConnectionPool(buildPoolConfig(connection));
|
|
214
|
+
pool.config.pool = { ...(pool.config.pool ?? {}), max: 1, min: 1 };
|
|
215
|
+
pool.config.requestTimeout = LONG_REQUEST_TIMEOUT_MS;
|
|
216
|
+
await pool.connect();
|
|
217
|
+
return {
|
|
218
|
+
label: "SQL Server",
|
|
219
|
+
exec: (query, options) => {
|
|
220
|
+
if (GO_SEPARATOR.test(query)) {
|
|
221
|
+
throw new Error('T-SQL "GO" batch separators are not supported — send one statement per query.');
|
|
222
|
+
}
|
|
223
|
+
return runMssqlStatement(sql, pool, query, { ...options, preferBatch: true });
|
|
224
|
+
},
|
|
225
|
+
begin: async () => {
|
|
226
|
+
await pool.request().batch("BEGIN TRANSACTION");
|
|
227
|
+
},
|
|
228
|
+
commit: async () => {
|
|
229
|
+
await pool.request().batch("IF @@TRANCOUNT > 0 COMMIT TRANSACTION");
|
|
230
|
+
},
|
|
231
|
+
rollback: async () => {
|
|
232
|
+
await pool.request().batch("IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION");
|
|
233
|
+
},
|
|
234
|
+
close: () => pool.close(),
|
|
235
|
+
};
|
|
236
|
+
};
|
|
237
|
+
exports.openMssqlSession = openMssqlSession;
|
|
122
238
|
// Pooled path (configureDbPooling): one long-lived mssql ConnectionPool per
|
|
123
239
|
// connection identity (tarn hands out / heals the connections underneath).
|
|
124
240
|
// Session-changing statements keep using a private one-shot pool.
|
|
125
|
-
const executeMssqlQueryPooled = async (connection, query,
|
|
241
|
+
const executeMssqlQueryPooled = async (connection, query, options) => {
|
|
126
242
|
const settings = (0, dbPool_js_1.getDbPoolSettings)();
|
|
127
243
|
const entry = await (0, dbPool_js_1.getOrCreateDbPool)(connection, async () => {
|
|
128
244
|
const sql = await loadMssqlDriver();
|
|
@@ -148,7 +264,7 @@ const executeMssqlQueryPooled = async (connection, query, params) => {
|
|
|
148
264
|
timings.connectMs = acquireMs;
|
|
149
265
|
const queryTimer = (0, dbTimings_js_1.startDbTimer)();
|
|
150
266
|
try {
|
|
151
|
-
const result = await runMssqlStatement(entry.handle.pool, query,
|
|
267
|
+
const result = await runMssqlStatement(await loadMssqlDriver(), entry.handle.pool, query, options);
|
|
152
268
|
timings.queryMs = queryTimer();
|
|
153
269
|
return { ...result, timings };
|
|
154
270
|
}
|
|
@@ -156,37 +272,32 @@ const executeMssqlQueryPooled = async (connection, query, params) => {
|
|
|
156
272
|
(0, dbPool_js_1.markReleased)(entry, false);
|
|
157
273
|
}
|
|
158
274
|
};
|
|
159
|
-
const executeMssqlQuery = async (connection, query,
|
|
275
|
+
const executeMssqlQuery = async (connection, query, paramsOrOptions = []) => {
|
|
276
|
+
const options = Array.isArray(paramsOrOptions)
|
|
277
|
+
? { params: paramsOrOptions }
|
|
278
|
+
: paramsOrOptions;
|
|
160
279
|
if (GO_SEPARATOR.test(query)) {
|
|
161
280
|
throw new Error('T-SQL "GO" batch separators are not supported — send one statement per query.');
|
|
162
281
|
}
|
|
163
|
-
|
|
164
|
-
|
|
282
|
+
// The pooled path keeps the driver's default time limit, so a statement
|
|
283
|
+
// with its own limit gets a private pool sized for it.
|
|
284
|
+
if ((0, dbPool_js_1.isDbPoolingEnabled)() && !(0, dbPool_js_1.isSessionMutatingStatement)(query) && !options.timeoutMs) {
|
|
285
|
+
return executeMssqlQueryPooled(connection, query, options);
|
|
165
286
|
}
|
|
166
287
|
const sql = await loadMssqlDriver();
|
|
167
288
|
const timings = (0, dbTimings_js_1.emptyDbTimings)();
|
|
168
289
|
const connectTimer = (0, dbTimings_js_1.startDbTimer)();
|
|
169
290
|
const pool = new sql.ConnectionPool(buildPoolConfig(connection));
|
|
291
|
+
if (options.timeoutMs && pool.config) {
|
|
292
|
+
pool.config.requestTimeout = Math.floor(options.timeoutMs) + 5000;
|
|
293
|
+
}
|
|
170
294
|
try {
|
|
171
295
|
await pool.connect();
|
|
172
296
|
timings.connectMs = connectTimer();
|
|
173
297
|
const queryTimer = (0, dbTimings_js_1.startDbTimer)();
|
|
174
|
-
const
|
|
175
|
-
params.forEach((value, index) => {
|
|
176
|
-
request.input(`p${index + 1}`, value);
|
|
177
|
-
});
|
|
178
|
-
const finalQuery = (0, sqlNormalize_js_1.stripTrailingSqlTerminator)(query, "mssql");
|
|
179
|
-
const result = await request.query(finalQuery);
|
|
298
|
+
const result = await runMssqlStatement(sql, pool, query, options);
|
|
180
299
|
timings.queryMs = queryTimer();
|
|
181
|
-
|
|
182
|
-
if (recordset.length > 0 || result?.recordset) {
|
|
183
|
-
const rows = recordset.map(normalizeMssqlValue);
|
|
184
|
-
return { rows, rowCount: rows.length, timings };
|
|
185
|
-
}
|
|
186
|
-
const affected = Array.isArray(result?.rowsAffected)
|
|
187
|
-
? result.rowsAffected.reduce((sum, count) => sum + count, 0)
|
|
188
|
-
: 0;
|
|
189
|
-
return { rows: [], rowCount: affected, timings };
|
|
300
|
+
return { ...result, timings };
|
|
190
301
|
}
|
|
191
302
|
finally {
|
|
192
303
|
const closeTimer = (0, dbTimings_js_1.startDbTimer)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mssqlAdapter.js","sourceRoot":"","sources":["../../../src/host/db/mssqlAdapter.ts"],"names":[],"mappings":";AAAA,2EAA2E;AAC3E,8EAA8E;AAC9E,qBAAqB;AACrB,EAAE;AACF,2EAA2E;AAC3E,4EAA4E;AAC5E,sDAAsD;;;AAEtD,wCAAgD;AAEhD,uDAA+D;AAC/D,iDAAmF;AACnF,2CAOqB;AAErB,MAAM,MAAM,GAAG,CAAC,GAAQ,EAAO,EAAE,CAC/B,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,OAAO,GAAG,CAAC,cAAc,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;AAErF,qCAAqC;AACrC,IAAI,mBAAmB,GAAQ,IAAI,CAAC;AAC7B,MAAM,wBAAwB,GAAG,CAAC,MAAkB,EAAQ,EAAE;IACnE,mBAAmB,GAAG,MAAM,CAAC;AAC/B,CAAC,CAAC;AAFW,QAAA,wBAAwB,4BAEnC;AAEF,MAAM,eAAe,GAAG,KAAK,IAAkB,EAAE;IAC/C,IAAI,mBAAmB,EAAE,CAAC;QACxB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IACD,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,IAAA,4BAAkB,EAAC,OAAO,CAAC,CAAC,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CACb,8FAA8F,CAC/F,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF,4EAA4E;AAC5E,wEAAwE;AACxE,MAAM,YAAY,GAAG,qBAAqB,CAAC;AAE3C,MAAM,eAAe,GAAG,CAAC,UAAwB,EAAW,EAAE;IAC5D,IAAI,UAAU,CAAC,gBAAgB,EAAE,IAAI,EAAE,EAAE,CAAC;QACxC,kEAAkE;QAClE,OAAO,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC;IACD,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;IAClE,OAAO;QACL,MAAM,EAAE,UAAU,CAAC,IAAI;QACvB,0EAA0E;QAC1E,mEAAmE;QACnE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;QAClD,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,IAAI,EAAE,UAAU,CAAC,QAAQ,IAAI,SAAS;QACtC,QAAQ,EAAE,UAAU,CAAC,QAAQ,IAAI,SAAS;QAC1C,iBAAiB,EAAE,IAAI;QACvB,OAAO,EAAE;YACP,YAAY;YACZ,mEAAmE;YACnE,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;YAChC,sBAAsB,EAAE,OAAO,CAAC,UAAU,CAAC,sBAAsB,CAAC;SACnE;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,yEAAyE;AACzE,4EAA4E;AAC5E,oEAAoE;AACpE,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAW,EAAE;IACtD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAC1D,OAAO,MAAM,CAAC,IAAI,CAAC,KAAmB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YACrE,GAAG;YACH,mBAAmB,CAAC,KAAK,CAAC;SAC3B,CAAC,CACH,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,wEAAwE;AACjE,MAAM,aAAa,GAAG,KAAK,EAChC,UAAwB,EACxB,EAA6B,EACjB,EAAE;IACd,MAAM,GAAG,GAAG,MAAM,eAAe,EAAE,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;YAAS,CAAC;QACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,aAAa,iBAYxB;AAEF,MAAM,QAAQ,GAAG,qBAAa,CAAC;AAExB,MAAM,mBAAmB,GAAG,KAAK,EAAE,UAAwB,EAAiB,EAAE;IACnF,MAAM,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACxC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B;AAEF,MAAM,iBAAiB,GAAG,KAAK,EAC7B,IAAS,EACT,KAAa,EACb,MAAiB,EAC+B,EAAE;IAClD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC/B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAC9B,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,IAAA,4CAA0B,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAC/E,MAAM,SAAS,GAAc,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,EAAE,SAAS,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAChD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IACzC,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC;QAClD,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC,CAAC;IACN,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAC1C,CAAC,CAAC;AAEF,4EAA4E;AAC5E,2EAA2E;AAC3E,kEAAkE;AAClE,MAAM,uBAAuB,GAAG,KAAK,EACnC,UAAwB,EACxB,KAAa,EACb,MAAiB,EACwD,EAAE;IAC3E,MAAM,QAAQ,GAAG,IAAA,6BAAiB,GAAE,CAAC;IACrC,MAAM,KAAK,GAAG,MAAM,IAAA,6BAAiB,EAAC,UAAU,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,GAAG,GAAG,MAAM,eAAe,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,MAAM,GACV,OAAO,IAAI,KAAK,QAAQ;YACtB,CAAC,CAAC,IAAI;YACN,CAAC,CAAC;gBACE,GAAI,IAAgC;gBACpC,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,EAAE,iBAAiB,EAAE,QAAQ,CAAC,aAAa,EAAE;aAC5F,CAAC;QACR,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAClC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;YAC/E,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE;YACzB,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAmB,EAAE,GAAG,IAAA,6BAAc,GAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,yBAAa,EAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACjG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAC9B,MAAM,UAAU,GAAG,IAAA,2BAAY,GAAE,CAAC;IAClC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACzE,OAAO,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;QAC/B,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC;IAChC,CAAC;YAAS,CAAC;QACT,IAAA,wBAAY,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,KAAK,EACpC,UAAwB,EACxB,KAAa,EACb,SAAoB,EAAE,EACoD,EAAE;IAC5E,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;IACJ,CAAC;IACD,IAAI,IAAA,8BAAkB,GAAE,IAAI,CAAC,IAAA,sCAA0B,EAAC,KAAK,CAAC,EAAE,CAAC;QAC/D,OAAO,uBAAuB,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,eAAe,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,6BAAc,GAAE,CAAC;IACjC,MAAM,YAAY,GAAG,IAAA,2BAAY,GAAE,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,IAAA,2BAAY,GAAE,CAAC;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC9B,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,IAAA,4CAA0B,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAE/C,OAAO,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAc,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,EAAE,SAAS,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YAChD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QAClD,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC;YAClD,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC,CAAC;QACN,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACnD,CAAC;YAAS,CAAC;QACT,MAAM,UAAU,GAAG,IAAA,2BAAY,GAAE,CAAC;QAClC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;IACjC,CAAC;AACH,CAAC,CAAC;AA7CW,QAAA,iBAAiB,qBA6C5B"}
|
|
1
|
+
{"version":3,"file":"mssqlAdapter.js","sourceRoot":"","sources":["../../../src/host/db/mssqlAdapter.ts"],"names":[],"mappings":";AAAA,2EAA2E;AAC3E,8EAA8E;AAC9E,qBAAqB;AACrB,EAAE;AACF,2EAA2E;AAC3E,4EAA4E;AAC5E,sDAAsD;;;AAEtD,wCAAgD;AAEhD,6CAAsH;AACtH,uDAA+D;AAC/D,iDAAmF;AACnF,2CAOqB;AAErB,MAAM,MAAM,GAAG,CAAC,GAAQ,EAAO,EAAE,CAC/B,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,OAAO,GAAG,CAAC,cAAc,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;AAErF,qCAAqC;AACrC,IAAI,mBAAmB,GAAQ,IAAI,CAAC;AAC7B,MAAM,wBAAwB,GAAG,CAAC,MAAkB,EAAQ,EAAE;IACnE,mBAAmB,GAAG,MAAM,CAAC;AAC/B,CAAC,CAAC;AAFW,QAAA,wBAAwB,4BAEnC;AAEF,MAAM,eAAe,GAAG,KAAK,IAAkB,EAAE;IAC/C,IAAI,mBAAmB,EAAE,CAAC;QACxB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IACD,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,IAAA,4BAAkB,EAAC,OAAO,CAAC,CAAC,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CACb,8FAA8F,CAC/F,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF,4EAA4E;AAC5E,wEAAwE;AACxE,MAAM,YAAY,GAAG,qBAAqB,CAAC;AAE3C,MAAM,eAAe,GAAG,CAAC,UAAwB,EAAW,EAAE;IAC5D,IAAI,UAAU,CAAC,gBAAgB,EAAE,IAAI,EAAE,EAAE,CAAC;QACxC,kEAAkE;QAClE,OAAO,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC;IACD,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;IAClE,OAAO;QACL,MAAM,EAAE,UAAU,CAAC,IAAI;QACvB,0EAA0E;QAC1E,mEAAmE;QACnE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;QAClD,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,IAAI,EAAE,UAAU,CAAC,QAAQ,IAAI,SAAS;QACtC,QAAQ,EAAE,UAAU,CAAC,QAAQ,IAAI,SAAS;QAC1C,iBAAiB,EAAE,IAAI;QACvB,OAAO,EAAE;YACP,YAAY;YACZ,mEAAmE;YACnE,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;YAChC,sBAAsB,EAAE,OAAO,CAAC,UAAU,CAAC,sBAAsB,CAAC;SACnE;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,yEAAyE;AACzE,4EAA4E;AAC5E,oEAAoE;AACpE,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAW,EAAE;IACtD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAC1D,OAAO,MAAM,CAAC,IAAI,CAAC,KAAmB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YACrE,GAAG;YACH,mBAAmB,CAAC,KAAK,CAAC;SAC3B,CAAC,CACH,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,wEAAwE;AACjE,MAAM,aAAa,GAAG,KAAK,EAChC,UAAwB,EACxB,EAA6B,EACjB,EAAE;IACd,MAAM,GAAG,GAAG,MAAM,eAAe,EAAE,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;YAAS,CAAC;QACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,aAAa,iBAYxB;AAEF,MAAM,QAAQ,GAAG,qBAAa,CAAC;AAExB,MAAM,mBAAmB,GAAG,KAAK,EAAE,UAAwB,EAAiB,EAAE;IACnF,MAAM,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACxC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B;AAEF,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAE,IAAiB,EAAW,EAAE;IAC7D,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,KAAK;YACR,OAAO,GAAG,CAAC,MAAM,CAAC;QACpB,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7B,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,GAAG,CAAC;QACjB,KAAK,MAAM;YACT,OAAO,GAAG,CAAC,IAAI,CAAC;QAClB,KAAK,WAAW;YACd,OAAO,GAAG,CAAC,SAAS,CAAC;QACvB,KAAK,MAAM;YACT,OAAO,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC;YACE,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAE,OAAY,EAAE,OAAyB,EAAQ,EAAE;IAChF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC9C,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACpE,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;YAC7B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QACjD,CAAC;aAAM,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YACtC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,4EAA4E;AAC5E,iEAAiE;AACjE,MAAM,iBAAiB,GAAG,KAAK,EAC7B,GAAQ,EACR,IAAS,EACT,KAAa,EACb,OAAqD,EACzB,EAAE;IAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC/B,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3E,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC1B,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAA0B,EAAE,EAAE;YAClD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,KAAK,GACT,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,GAAG,CAAC;QACxC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE;YACd,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACrB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC;QACvB,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,WAAW,GAAG,IAAA,sBAAS,EAAC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACxE,IAAI,CAAC;QACH,2EAA2E;QAC3E,6EAA6E;QAC7E,gDAAgD;QAChD,MAAM,UAAU,GAAG,IAAA,4CAA0B,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,MAAM,GACV,OAAO,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACxG,MAAM,SAAS,GAAc,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACnE,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC;YAClD,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC,CAAC;QACN,MAAM,UAAU,GAAgB,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3F,MAAM,GAAG,GAA4B,EAAE,CAAC;QACxC,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5D,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO;gBAAE,SAAS;YACrE,MAAM,IAAI,GAAG,IAAA,wBAAW,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACxD,GAAG,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,IAAA,kCAAqB,EAAC;YAC3B,IAAI;YACJ,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;YAC1C,GAAG;YACH,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;gBACvB,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,EAAE;gBACvE,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,2BAAc,EAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACpE,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,oCAAuB,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACpH,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,WAAW,EAAE,CAAC;QACd,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEnD,8EAA8E;AAC9E,wEAAwE;AACjE,MAAM,gBAAgB,GAAG,KAAK,EAAE,UAAwB,EAAE,EAAE;IACjE,MAAM,GAAG,GAAG,MAAM,eAAe,EAAE,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;IACnE,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,uBAAuB,CAAC;IACrD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACrB,OAAO;QACL,KAAK,EAAE,YAAY;QACnB,IAAI,EAAE,CAAC,KAAa,EAAE,OAAyB,EAAE,EAAE;YACjD,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;YACnG,CAAC;YACD,OAAO,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAChF,CAAC;QACD,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,EAAE,KAAK,IAAI,EAAE;YACjB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QACtE,CAAC;QACD,QAAQ,EAAE,KAAK,IAAI,EAAE;YACnB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACxE,CAAC;QACD,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAmB;KAC3C,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B;AAEF,4EAA4E;AAC5E,2EAA2E;AAC3E,kEAAkE;AAClE,MAAM,uBAAuB,GAAG,KAAK,EACnC,UAAwB,EACxB,KAAa,EACb,OAAyB,EACiC,EAAE;IAC5D,MAAM,QAAQ,GAAG,IAAA,6BAAiB,GAAE,CAAC;IACrC,MAAM,KAAK,GAAG,MAAM,IAAA,6BAAiB,EAAC,UAAU,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,GAAG,GAAG,MAAM,eAAe,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,MAAM,GACV,OAAO,IAAI,KAAK,QAAQ;YACtB,CAAC,CAAC,IAAI;YACN,CAAC,CAAC;gBACE,GAAI,IAAgC;gBACpC,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,EAAE,iBAAiB,EAAE,QAAQ,CAAC,aAAa,EAAE;aAC5F,CAAC;QACR,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAClC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;YAC/E,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE;YACzB,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAmB,EAAE,GAAG,IAAA,6BAAc,GAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,yBAAa,EAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACjG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAC9B,MAAM,UAAU,GAAG,IAAA,2BAAY,GAAE,CAAC;IAClC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,eAAe,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACnG,OAAO,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;QAC/B,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC;IAChC,CAAC;YAAS,CAAC;QACT,IAAA,wBAAY,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,KAAK,EACpC,UAAwB,EACxB,KAAa,EACb,kBAAgD,EAAE,EACS,EAAE;IAC7D,MAAM,OAAO,GAAqB,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;QAC9D,CAAC,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE;QAC7B,CAAC,CAAC,eAAe,CAAC;IACpB,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;IACJ,CAAC;IACD,wEAAwE;IACxE,uDAAuD;IACvD,IAAI,IAAA,8BAAkB,GAAE,IAAI,CAAC,IAAA,sCAA0B,EAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACrF,OAAO,uBAAuB,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,eAAe,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,6BAAc,GAAE,CAAC;IACjC,MAAM,YAAY,GAAG,IAAA,2BAAY,GAAE,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACjE,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IACpE,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,IAAA,2BAAY,GAAE,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAClE,OAAO,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;QAC/B,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC;IAChC,CAAC;YAAS,CAAC;QACT,MAAM,UAAU,GAAG,IAAA,2BAAY,GAAE,CAAC;QAClC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;IACjC,CAAC;AACH,CAAC,CAAC;AAtCW,QAAA,iBAAiB,qBAsC5B"}
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
// MySQL adapter. Ported from `pmanfrontend/electron/db/mysqlAdapter.ts` with
|
|
3
3
|
// lazy `mysql2/promise` loading via `loadOptionalModule`.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.executeMysqlQuery = exports.testMysqlConnection = exports.withMysqlConnection = exports.__setMysqlDriverForTests = void 0;
|
|
5
|
+
exports.executeMysqlQuery = exports.openMysqlSession = exports.testMysqlConnection = exports.withMysqlConnection = exports.__setMysqlDriverForTests = void 0;
|
|
6
6
|
const lazy_js_1 = require("../lazy.js");
|
|
7
|
+
const dbBinds_js_1 = require("./dbBinds.js");
|
|
7
8
|
const sqlNormalize_js_1 = require("./sqlNormalize.js");
|
|
8
9
|
const dbTimings_js_1 = require("./dbTimings.js");
|
|
9
10
|
const dbPool_js_1 = require("./dbPool.js");
|
|
@@ -104,8 +105,16 @@ const testMysqlConnection = async (connection) => {
|
|
|
104
105
|
}
|
|
105
106
|
};
|
|
106
107
|
exports.testMysqlConnection = testMysqlConnection;
|
|
108
|
+
const isMysqlHeader = (entry) => Boolean(entry) && typeof entry === "object" && !Array.isArray(entry) && "affectedRows" in entry;
|
|
107
109
|
const toMysqlResult = (result) => {
|
|
108
110
|
if (Array.isArray(result)) {
|
|
111
|
+
// CALL answers [rowsA, rowsB, …, header]; a plain SELECT answers its rows.
|
|
112
|
+
if (result.some((entry) => Array.isArray(entry) || isMysqlHeader(entry))) {
|
|
113
|
+
const resultSets = result
|
|
114
|
+
.filter((entry) => Array.isArray(entry))
|
|
115
|
+
.map((set) => set.map(normalizeMysqlValue));
|
|
116
|
+
return { rows: resultSets[0] ?? [], rowCount: resultSets[0]?.length ?? 0, resultSets };
|
|
117
|
+
}
|
|
109
118
|
const rows = result.map(normalizeMysqlValue);
|
|
110
119
|
return { rows, rowCount: rows.length };
|
|
111
120
|
}
|
|
@@ -114,8 +123,56 @@ const toMysqlResult = (result) => {
|
|
|
114
123
|
: 0;
|
|
115
124
|
return { rows: [], rowCount: affected };
|
|
116
125
|
};
|
|
126
|
+
// MySQL OUT parameters are session variables: `CALL p(?, @name)`. An `inout`
|
|
127
|
+
// bind sets the variable first; every out bind reads it after the call.
|
|
128
|
+
const runMysqlStatement = async (conn, query, options) => {
|
|
129
|
+
const binds = options.binds ?? [];
|
|
130
|
+
const outs = binds
|
|
131
|
+
.map((bind, index) => ({ bind, name: (0, dbBinds_js_1.outBindName)(bind, index).replace(/^@/, "") }))
|
|
132
|
+
.filter(({ bind }) => bind.direction === "out" || bind.direction === "inout");
|
|
133
|
+
for (const { bind, name } of outs) {
|
|
134
|
+
if (bind.direction === "inout") {
|
|
135
|
+
await conn.query(`SET @\`${name}\` = ?`, [bind.value ?? null]);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
const values = (0, dbBinds_js_1.positionalBindValues)({
|
|
139
|
+
...options,
|
|
140
|
+
...(options.binds ? { binds: binds.filter((bind) => bind.direction !== "inout") } : {}),
|
|
141
|
+
});
|
|
142
|
+
const finalQuery = (0, sqlNormalize_js_1.stripTrailingSqlTerminator)(query, "mysql");
|
|
143
|
+
const [result] = await conn.query(options.timeoutMs ? { sql: finalQuery, timeout: Math.floor(options.timeoutMs) } : finalQuery, values);
|
|
144
|
+
const base = toMysqlResult(result);
|
|
145
|
+
const out = {};
|
|
146
|
+
if (outs.length > 0) {
|
|
147
|
+
const [outRows] = await conn.query(`SELECT ${outs.map(({ name }) => `@\`${name}\` AS \`${name}\``).join(", ")}`);
|
|
148
|
+
const row = (normalizeMysqlValue(outRows[0]) ?? {});
|
|
149
|
+
for (const { name } of outs)
|
|
150
|
+
out[name] = row[name] ?? null;
|
|
151
|
+
}
|
|
152
|
+
return (0, dbBinds_js_1.finishStatementResult)({ ...base, out });
|
|
153
|
+
};
|
|
154
|
+
// A dedicated connection for a run's session. See dbSessionManager.
|
|
155
|
+
const openMysqlSession = async (connection) => {
|
|
156
|
+
const mysql = await loadMysqlDriver();
|
|
157
|
+
const conn = await mysql.createConnection(buildConnectionConfig(connection));
|
|
158
|
+
return {
|
|
159
|
+
label: "MySQL",
|
|
160
|
+
exec: (query, options) => runMysqlStatement(conn, query, options),
|
|
161
|
+
begin: async () => {
|
|
162
|
+
await conn.query("START TRANSACTION");
|
|
163
|
+
},
|
|
164
|
+
commit: async () => {
|
|
165
|
+
await conn.query("COMMIT");
|
|
166
|
+
},
|
|
167
|
+
rollback: async () => {
|
|
168
|
+
await conn.query("ROLLBACK");
|
|
169
|
+
},
|
|
170
|
+
close: () => conn.end(),
|
|
171
|
+
};
|
|
172
|
+
};
|
|
173
|
+
exports.openMysqlSession = openMysqlSession;
|
|
117
174
|
// Pooled path (configureDbPooling): one mysql2 pool per connection identity.
|
|
118
|
-
const executeMysqlQueryPooled = async (connection, query,
|
|
175
|
+
const executeMysqlQueryPooled = async (connection, query, options) => {
|
|
119
176
|
const settings = (0, dbPool_js_1.getDbPoolSettings)();
|
|
120
177
|
const entry = await (0, dbPool_js_1.getOrCreateDbPool)(connection, async () => {
|
|
121
178
|
const mysql = await loadMysqlDriver();
|
|
@@ -151,10 +208,9 @@ const executeMysqlQueryPooled = async (connection, query, params) => {
|
|
|
151
208
|
let failed = false;
|
|
152
209
|
const queryTimer = (0, dbTimings_js_1.startDbTimer)();
|
|
153
210
|
try {
|
|
154
|
-
const
|
|
155
|
-
const [result] = await conn.query(finalQuery, params);
|
|
211
|
+
const result = await runMysqlStatement(conn, query, options);
|
|
156
212
|
timings.queryMs = queryTimer();
|
|
157
|
-
return { ...
|
|
213
|
+
return { ...result, timings };
|
|
158
214
|
}
|
|
159
215
|
catch (error) {
|
|
160
216
|
failed = true;
|
|
@@ -173,9 +229,12 @@ const executeMysqlQueryPooled = async (connection, query, params) => {
|
|
|
173
229
|
timings.closeMs = closeTimer();
|
|
174
230
|
}
|
|
175
231
|
};
|
|
176
|
-
const executeMysqlQuery = async (connection, query,
|
|
232
|
+
const executeMysqlQuery = async (connection, query, paramsOrOptions = []) => {
|
|
233
|
+
const options = Array.isArray(paramsOrOptions)
|
|
234
|
+
? { params: paramsOrOptions }
|
|
235
|
+
: paramsOrOptions;
|
|
177
236
|
if ((0, dbPool_js_1.isDbPoolingEnabled)()) {
|
|
178
|
-
return executeMysqlQueryPooled(connection, query,
|
|
237
|
+
return executeMysqlQueryPooled(connection, query, options);
|
|
179
238
|
}
|
|
180
239
|
const mysql = await loadMysqlDriver();
|
|
181
240
|
const timings = (0, dbTimings_js_1.emptyDbTimings)();
|
|
@@ -184,17 +243,9 @@ const executeMysqlQuery = async (connection, query, params = []) => {
|
|
|
184
243
|
timings.connectMs = connectTimer();
|
|
185
244
|
const queryTimer = (0, dbTimings_js_1.startDbTimer)();
|
|
186
245
|
try {
|
|
187
|
-
const
|
|
188
|
-
const [result] = await conn.query(finalQuery, params);
|
|
246
|
+
const result = await runMysqlStatement(conn, query, options);
|
|
189
247
|
timings.queryMs = queryTimer();
|
|
190
|
-
|
|
191
|
-
const rows = result.map(normalizeMysqlValue);
|
|
192
|
-
return { rows, rowCount: rows.length, timings };
|
|
193
|
-
}
|
|
194
|
-
const affected = result && typeof result.affectedRows === "number"
|
|
195
|
-
? result.affectedRows
|
|
196
|
-
: 0;
|
|
197
|
-
return { rows: [], rowCount: affected, timings };
|
|
248
|
+
return { ...result, timings };
|
|
198
249
|
}
|
|
199
250
|
finally {
|
|
200
251
|
const closeTimer = (0, dbTimings_js_1.startDbTimer)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysqlAdapter.js","sourceRoot":"","sources":["../../../src/host/db/mysqlAdapter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mysqlAdapter.js","sourceRoot":"","sources":["../../../src/host/db/mysqlAdapter.ts"],"names":[],"mappings":"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"}
|