@oino-ts/db-mariadb 0.9.1 → 0.10.1

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.
Files changed (4) hide show
  1. package/dist/cjs/OINODbMariadb.js +10 -10
  2. package/dist/esm/OINODbMariadb.js +10 -10
  3. package/package.json +2 -2
  4. package/src/OINODbMariadb.ts +10 -10
package/dist/cjs/OINODbMariadb.js CHANGED
@@ -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("@oino-ts/db-mariadb", "OINODbMariadb", "connect", result.statusMessage, { message: e.message, stack: e.stack });
261
+ db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", "exception in connect", { message: e.message, stack: e.stack });
262
262
  }
263
263
  finally {
264
264
  if (connection) {
@@ -272,7 +272,7 @@ class OINODbMariadb extends db_1.OINODb {
272
272
  *
273
273
  */
274
274
  async validate() {
275
- db_1.OINOBenchmark.start("OINODb", "validate");
275
+ db_1.OINOBenchmark.startMetric("OINODb", "validate");
276
276
  let result = new db_1.OINOResult();
277
277
  try {
278
278
  const sql = this._getValidateSql(this._params.database);
@@ -292,9 +292,9 @@ 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("@oino-ts/db-mariadb", "OINODbMariadb", "validate", result.statusMessage, { message: e, stack: e.stack });
295
+ db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "validate", "exception in validate", { message: e.message, stack: e.stack });
296
296
  }
297
- db_1.OINOBenchmark.end("OINODb", "validate");
297
+ db_1.OINOBenchmark.endMetric("OINODb", "validate");
298
298
  return result;
299
299
  }
300
300
  /**
@@ -304,17 +304,17 @@ class OINODbMariadb extends db_1.OINODb {
304
304
  *
305
305
  */
306
306
  async sqlSelect(sql) {
307
- db_1.OINOBenchmark.start("OINODb", "sqlSelect");
307
+ db_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
308
308
  let result;
309
309
  try {
310
310
  const rows = await this._query(sql);
311
311
  result = new OINOMariadbData(rows, []);
312
312
  }
313
313
  catch (e) {
314
- db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "SQL select exception", { message: e.message, stack: e.stack });
314
+ db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "exception in SQL select", { 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
- db_1.OINOBenchmark.end("OINODb", "sqlSelect");
317
+ db_1.OINOBenchmark.endMetric("OINODb", "sqlSelect");
318
318
  return result;
319
319
  }
320
320
  /**
@@ -324,7 +324,7 @@ class OINODbMariadb extends db_1.OINODb {
324
324
  *
325
325
  */
326
326
  async sqlExec(sql) {
327
- db_1.OINOBenchmark.start("OINODb", "sqlExec");
327
+ db_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
328
328
  let result;
329
329
  try {
330
330
  const sql_res = await this._exec(sql);
@@ -332,10 +332,10 @@ 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("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "SQL exec exception", { message: msg_parts[2], stack: e.stack });
335
+ db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "exception in SQL exec", { 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
- db_1.OINOBenchmark.end("OINODb", "sqlExec");
338
+ db_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
339
339
  return result;
340
340
  }
341
341
  _getSchemaSql(dbName, tableName) {
package/dist/esm/OINODbMariadb.js CHANGED
@@ -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("@oino-ts/db-mariadb", "OINODbMariadb", "connect", result.statusMessage, { message: e.message, stack: e.stack });
258
+ OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", "exception in connect", { message: e.message, stack: e.stack });
259
259
  }
260
260
  finally {
261
261
  if (connection) {
@@ -269,7 +269,7 @@ export class OINODbMariadb extends OINODb {
269
269
  *
270
270
  */
271
271
  async validate() {
272
- OINOBenchmark.start("OINODb", "validate");
272
+ OINOBenchmark.startMetric("OINODb", "validate");
273
273
  let result = new OINOResult();
274
274
  try {
275
275
  const sql = this._getValidateSql(this._params.database);
@@ -289,9 +289,9 @@ 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("@oino-ts/db-mariadb", "OINODbMariadb", "validate", result.statusMessage, { message: e, stack: e.stack });
292
+ OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "validate", "exception in validate", { message: e.message, stack: e.stack });
293
293
  }
294
- OINOBenchmark.end("OINODb", "validate");
294
+ OINOBenchmark.endMetric("OINODb", "validate");
295
295
  return result;
296
296
  }
297
297
  /**
@@ -301,17 +301,17 @@ export class OINODbMariadb extends OINODb {
301
301
  *
302
302
  */
303
303
  async sqlSelect(sql) {
304
- OINOBenchmark.start("OINODb", "sqlSelect");
304
+ OINOBenchmark.startMetric("OINODb", "sqlSelect");
305
305
  let result;
306
306
  try {
307
307
  const rows = await this._query(sql);
308
308
  result = new OINOMariadbData(rows, []);
309
309
  }
310
310
  catch (e) {
311
- OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "SQL select exception", { message: e.message, stack: e.stack });
311
+ OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "exception in SQL select", { 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
- OINOBenchmark.end("OINODb", "sqlSelect");
314
+ OINOBenchmark.endMetric("OINODb", "sqlSelect");
315
315
  return result;
316
316
  }
317
317
  /**
@@ -321,7 +321,7 @@ export class OINODbMariadb extends OINODb {
321
321
  *
322
322
  */
323
323
  async sqlExec(sql) {
324
- OINOBenchmark.start("OINODb", "sqlExec");
324
+ OINOBenchmark.startMetric("OINODb", "sqlExec");
325
325
  let result;
326
326
  try {
327
327
  const sql_res = await this._exec(sql);
@@ -329,10 +329,10 @@ export class OINODbMariadb extends OINODb {
329
329
  }
330
330
  catch (e) {
331
331
  const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
332
- OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "SQL exec exception", { message: msg_parts[2], stack: e.stack });
332
+ OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "exception in SQL exec", { 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
- OINOBenchmark.end("OINODb", "sqlExec");
335
+ OINOBenchmark.endMetric("OINODb", "sqlExec");
336
336
  return result;
337
337
  }
338
338
  _getSchemaSql(dbName, tableName) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oino-ts/db-mariadb",
3
- "version": "0.9.1",
3
+ "version": "0.10.1",
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.9.1",
24
+ "@oino-ts/db": "^0.10.1",
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("@oino-ts/db-mariadb", "OINODbMariadb", "connect", result.statusMessage, {message:e.message, stack:e.stack})
279
+ OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", "exception in connect", {message:e.message, stack:e.stack})
280
280
  } finally {
281
281
  if (connection) {
282
282
  await connection.end()
@@ -291,7 +291,7 @@ export class OINODbMariadb extends OINODb {
291
291
  *
292
292
  */
293
293
  async validate(): Promise<OINOResult> {
294
- OINOBenchmark.start("OINODb", "validate")
294
+ OINOBenchmark.startMetric("OINODb", "validate")
295
295
  let result:OINOResult = new OINOResult()
296
296
  try {
297
297
  const sql = this._getValidateSql(this._params.database)
@@ -310,9 +310,9 @@ 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("@oino-ts/db-mariadb", "OINODbMariadb", "validate", result.statusMessage, {message:e, stack:e.stack})
313
+ OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "validate", "exception in validate", {message:e.message, stack:e.stack})
314
314
  }
315
- OINOBenchmark.end("OINODb", "validate")
315
+ OINOBenchmark.endMetric("OINODb", "validate")
316
316
  return result
317
317
  }
318
318
 
@@ -323,17 +323,17 @@ export class OINODbMariadb extends OINODb {
323
323
  *
324
324
  */
325
325
  async sqlSelect(sql:string): Promise<OINODbDataSet> {
326
- OINOBenchmark.start("OINODb", "sqlSelect")
326
+ OINOBenchmark.startMetric("OINODb", "sqlSelect")
327
327
  let result:OINODbDataSet
328
328
  try {
329
329
  const rows:OINODataRow[] = await this._query(sql)
330
330
  result = new OINOMariadbData(rows, [])
331
331
 
332
332
  } catch (e:any) {
333
- OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "SQL select exception", {message:e.message, stack:e.stack})
333
+ OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "exception in SQL select", {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
- OINOBenchmark.end("OINODb", "sqlSelect")
336
+ OINOBenchmark.endMetric("OINODb", "sqlSelect")
337
337
  return result
338
338
  }
339
339
 
@@ -344,7 +344,7 @@ export class OINODbMariadb extends OINODb {
344
344
  *
345
345
  */
346
346
  async sqlExec(sql:string): Promise<OINODbDataSet> {
347
- OINOBenchmark.start("OINODb", "sqlExec")
347
+ OINOBenchmark.startMetric("OINODb", "sqlExec")
348
348
  let result:OINODbDataSet
349
349
  try {
350
350
  const sql_res:OINODataRow[] = await this._exec(sql)
@@ -352,10 +352,10 @@ 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("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "SQL exec exception", {message:msg_parts[2], stack:e.stack})
355
+ OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "exception in SQL exec", {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
- OINOBenchmark.end("OINODb", "sqlExec")
358
+ OINOBenchmark.endMetric("OINODb", "sqlExec")
359
359
  return result
360
360
  }
361
361