@oino-ts/db-mariadb 0.8.0 → 0.8.2
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.
|
@@ -258,7 +258,7 @@ class OINODbMariadb extends db_1.OINODb {
|
|
|
258
258
|
catch (e) {
|
|
259
259
|
const msg_parts = e.message.match(OINODbMariadb._connectionExceptionMessageRegex) || [];
|
|
260
260
|
result.setError(500, "Error connecting to server: " + msg_parts[2], "OINODbMariadb.connect");
|
|
261
|
-
db_1.OINOLog.exception("@
|
|
261
|
+
db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", result.statusMessage, { message: e.message, stack: e.stack });
|
|
262
262
|
}
|
|
263
263
|
finally {
|
|
264
264
|
if (connection) {
|
|
@@ -292,7 +292,7 @@ class OINODbMariadb extends db_1.OINODb {
|
|
|
292
292
|
}
|
|
293
293
|
catch (e) {
|
|
294
294
|
result.setError(500, "Exception validating connection: " + e.message, "OINODbMariadb.validate");
|
|
295
|
-
db_1.OINOLog.exception("@
|
|
295
|
+
db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "validate", result.statusMessage, { message: e, stack: e.stack });
|
|
296
296
|
}
|
|
297
297
|
db_1.OINOBenchmark.end("OINODb", "validate");
|
|
298
298
|
return result;
|
|
@@ -311,7 +311,7 @@ class OINODbMariadb extends db_1.OINODb {
|
|
|
311
311
|
result = new OINOMariadbData(rows, []);
|
|
312
312
|
}
|
|
313
313
|
catch (e) {
|
|
314
|
-
db_1.OINOLog.exception("@
|
|
314
|
+
db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "SQL select exception", { message: e.message, stack: e.stack });
|
|
315
315
|
result = new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, [db_1.OINO_ERROR_PREFIX + " (sqlSelect): OINODbMariadb.sqlSelect exception in _db.query: " + e.message]);
|
|
316
316
|
}
|
|
317
317
|
db_1.OINOBenchmark.end("OINODb", "sqlSelect");
|
|
@@ -332,7 +332,7 @@ class OINODbMariadb extends db_1.OINODb {
|
|
|
332
332
|
}
|
|
333
333
|
catch (e) {
|
|
334
334
|
const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
|
|
335
|
-
db_1.OINOLog.exception("@
|
|
335
|
+
db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "SQL exec exception", { message: msg_parts[2], stack: e.stack });
|
|
336
336
|
result = new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, [db_1.OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + msg_parts[2] + "]"]);
|
|
337
337
|
}
|
|
338
338
|
db_1.OINOBenchmark.end("OINODb", "sqlExec");
|
|
@@ -385,7 +385,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
|
|
|
385
385
|
isNotNull: row[2] == "NO"
|
|
386
386
|
};
|
|
387
387
|
if (api.isFieldIncluded(field_name) == false) {
|
|
388
|
-
db_1.OINOLog.info("@
|
|
388
|
+
db_1.OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", ".initializeApiDatamodel", "Field excluded in API parameters", { field: field_name });
|
|
389
389
|
if (field_params.isPrimaryKey) {
|
|
390
390
|
throw new Error(db_1.OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name);
|
|
391
391
|
}
|
|
@@ -420,13 +420,13 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
|
|
|
420
420
|
}
|
|
421
421
|
}
|
|
422
422
|
else {
|
|
423
|
-
db_1.OINOLog.info("@
|
|
423
|
+
db_1.OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", "initializeApiDatamodel", "Unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, field_length1: field_length1, field_length2: field_length2, field_params: field_params });
|
|
424
424
|
api.datamodel.addField(new db_1.OINOStringDataField(this, field_name, sql_type, field_params, 0));
|
|
425
425
|
}
|
|
426
426
|
}
|
|
427
427
|
await schema_res.next();
|
|
428
428
|
}
|
|
429
|
-
db_1.OINOLog.info("@
|
|
429
|
+
db_1.OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
|
|
430
430
|
return Promise.resolve();
|
|
431
431
|
}
|
|
432
432
|
}
|
|
@@ -255,7 +255,7 @@ export class OINODbMariadb extends OINODb {
|
|
|
255
255
|
catch (e) {
|
|
256
256
|
const msg_parts = e.message.match(OINODbMariadb._connectionExceptionMessageRegex) || [];
|
|
257
257
|
result.setError(500, "Error connecting to server: " + msg_parts[2], "OINODbMariadb.connect");
|
|
258
|
-
OINOLog.exception("@
|
|
258
|
+
OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", result.statusMessage, { message: e.message, stack: e.stack });
|
|
259
259
|
}
|
|
260
260
|
finally {
|
|
261
261
|
if (connection) {
|
|
@@ -289,7 +289,7 @@ export class OINODbMariadb extends OINODb {
|
|
|
289
289
|
}
|
|
290
290
|
catch (e) {
|
|
291
291
|
result.setError(500, "Exception validating connection: " + e.message, "OINODbMariadb.validate");
|
|
292
|
-
OINOLog.exception("@
|
|
292
|
+
OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "validate", result.statusMessage, { message: e, stack: e.stack });
|
|
293
293
|
}
|
|
294
294
|
OINOBenchmark.end("OINODb", "validate");
|
|
295
295
|
return result;
|
|
@@ -308,7 +308,7 @@ export class OINODbMariadb extends OINODb {
|
|
|
308
308
|
result = new OINOMariadbData(rows, []);
|
|
309
309
|
}
|
|
310
310
|
catch (e) {
|
|
311
|
-
OINOLog.exception("@
|
|
311
|
+
OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "SQL select exception", { message: e.message, stack: e.stack });
|
|
312
312
|
result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMariadb.sqlSelect exception in _db.query: " + e.message]);
|
|
313
313
|
}
|
|
314
314
|
OINOBenchmark.end("OINODb", "sqlSelect");
|
|
@@ -329,7 +329,7 @@ export class OINODbMariadb extends OINODb {
|
|
|
329
329
|
}
|
|
330
330
|
catch (e) {
|
|
331
331
|
const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
|
|
332
|
-
OINOLog.exception("@
|
|
332
|
+
OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "SQL exec exception", { message: msg_parts[2], stack: e.stack });
|
|
333
333
|
result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + msg_parts[2] + "]"]);
|
|
334
334
|
}
|
|
335
335
|
OINOBenchmark.end("OINODb", "sqlExec");
|
|
@@ -382,7 +382,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
|
|
|
382
382
|
isNotNull: row[2] == "NO"
|
|
383
383
|
};
|
|
384
384
|
if (api.isFieldIncluded(field_name) == false) {
|
|
385
|
-
OINOLog.info("@
|
|
385
|
+
OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", ".initializeApiDatamodel", "Field excluded in API parameters", { field: field_name });
|
|
386
386
|
if (field_params.isPrimaryKey) {
|
|
387
387
|
throw new Error(OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name);
|
|
388
388
|
}
|
|
@@ -417,13 +417,13 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
|
|
|
417
417
|
}
|
|
418
418
|
}
|
|
419
419
|
else {
|
|
420
|
-
OINOLog.info("@
|
|
420
|
+
OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", "initializeApiDatamodel", "Unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, field_length1: field_length1, field_length2: field_length2, field_params: field_params });
|
|
421
421
|
api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, 0));
|
|
422
422
|
}
|
|
423
423
|
}
|
|
424
424
|
await schema_res.next();
|
|
425
425
|
}
|
|
426
|
-
OINOLog.info("@
|
|
426
|
+
OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
|
|
427
427
|
return Promise.resolve();
|
|
428
428
|
}
|
|
429
429
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oino-ts/db-mariadb",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.2",
|
|
4
4
|
"description": "OINO TS package for using Mariadb databases.",
|
|
5
5
|
"author": "Matias Kiviniemi (pragmatta)",
|
|
6
6
|
"license": "MPL-2.0",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"module": "./dist/esm/index.js",
|
|
22
22
|
"types": "./dist/types/index.d.ts",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@oino-ts/db": "^0.8.
|
|
24
|
+
"@oino-ts/db": "^0.8.2",
|
|
25
25
|
"mariadb": "^3.2.3"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
package/src/OINODbMariadb.ts
CHANGED
|
@@ -276,7 +276,7 @@ export class OINODbMariadb extends OINODb {
|
|
|
276
276
|
} catch (e:any) {
|
|
277
277
|
const msg_parts = (e as Error).message.match(OINODbMariadb._connectionExceptionMessageRegex) || []
|
|
278
278
|
result.setError(500, "Error connecting to server: " + msg_parts[2], "OINODbMariadb.connect")
|
|
279
|
-
OINOLog.exception("@
|
|
279
|
+
OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", result.statusMessage, {message:e.message, stack:e.stack})
|
|
280
280
|
} finally {
|
|
281
281
|
if (connection) {
|
|
282
282
|
await connection.end()
|
|
@@ -310,7 +310,7 @@ export class OINODbMariadb extends OINODb {
|
|
|
310
310
|
}
|
|
311
311
|
} catch (e:any) {
|
|
312
312
|
result.setError(500, "Exception validating connection: " + e.message, "OINODbMariadb.validate")
|
|
313
|
-
OINOLog.exception("@
|
|
313
|
+
OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "validate", result.statusMessage, {message:e, stack:e.stack})
|
|
314
314
|
}
|
|
315
315
|
OINOBenchmark.end("OINODb", "validate")
|
|
316
316
|
return result
|
|
@@ -330,7 +330,7 @@ export class OINODbMariadb extends OINODb {
|
|
|
330
330
|
result = new OINOMariadbData(rows, [])
|
|
331
331
|
|
|
332
332
|
} catch (e:any) {
|
|
333
|
-
OINOLog.exception("@
|
|
333
|
+
OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "SQL select exception", {message:e.message, stack:e.stack})
|
|
334
334
|
result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMariadb.sqlSelect exception in _db.query: " + e.message])
|
|
335
335
|
}
|
|
336
336
|
OINOBenchmark.end("OINODb", "sqlSelect")
|
|
@@ -352,7 +352,7 @@ export class OINODbMariadb extends OINODb {
|
|
|
352
352
|
|
|
353
353
|
} catch (e:any) {
|
|
354
354
|
const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || []
|
|
355
|
-
OINOLog.exception("@
|
|
355
|
+
OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "SQL exec exception", {message:msg_parts[2], stack:e.stack})
|
|
356
356
|
result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + msg_parts[2] + "]"])
|
|
357
357
|
}
|
|
358
358
|
OINOBenchmark.end("OINODb", "sqlExec")
|
|
@@ -412,7 +412,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`
|
|
|
412
412
|
isNotNull: row[2] == "NO"
|
|
413
413
|
}
|
|
414
414
|
if (api.isFieldIncluded(field_name)==false) {
|
|
415
|
-
OINOLog.info("@
|
|
415
|
+
OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", ".initializeApiDatamodel", "Field excluded in API parameters", {field:field_name})
|
|
416
416
|
if (field_params.isPrimaryKey) {
|
|
417
417
|
throw new Error(OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name)
|
|
418
418
|
}
|
|
@@ -445,13 +445,13 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`
|
|
|
445
445
|
}
|
|
446
446
|
|
|
447
447
|
} else {
|
|
448
|
-
OINOLog.info("@
|
|
448
|
+
OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", "initializeApiDatamodel", "Unrecognized field type treated as string", {field_name: field_name, sql_type:sql_type, field_length1:field_length1, field_length2:field_length2, field_params:field_params })
|
|
449
449
|
api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, 0))
|
|
450
450
|
}
|
|
451
451
|
}
|
|
452
452
|
await schema_res.next()
|
|
453
453
|
}
|
|
454
|
-
OINOLog.info("@
|
|
454
|
+
OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"))
|
|
455
455
|
return Promise.resolve()
|
|
456
456
|
}
|
|
457
457
|
}
|