multi-db-orm 3.0.12 → 3.1.1

package/engines/multidb.js

@@ -1,68 +1,73 @@
-const { Sync } = require('../sync')
-const { Metrics } = require('./metrics')
-class MultiDbORM {
-
-    db
-    dbType
-    reqMade
-    lastQLatency
-    loglevel = 0
-    sync
-    metrics
-
-    constructor(db) {
-        this.db = db
-        this.sync = new Sync()
-        this.metrics = new Metrics(this.loglevel)
-    }
-
-    async connect() {
-
-    }
-
-    setdb(db) {
-        this.reqMade = 0
-        this.db = db;
-    }
-
-    getdb() {
-        this.reqMade++
-        return this.db;
-    }
-
-    async get(modelname, filter) {
-        if (this.loglevel > 4)
-            console.log("Not implemented")
-    }
-
-    async getOne(modelname, filter) {
-        if (this.loglevel > 4)
-            console.log("Not implemented")
-    }
-
-    async create(modelname, object) {
-        if (this.loglevel > 4)
-            console.log("Not implemented")
-    }
-
-    async insert(modelname, object) {
-        if (this.loglevel > 4)
-            console.log("Not implemented")
-    }
-
-    async update(modelname, filter, object) {
-        if (this.loglevel > 4)
-            console.log("Not implemented")
-    }
-
-    async delete(modelname, filter) {
-        if (this.loglevel > 4)
-            console.log("Not implemented")
-    }
-
-}
-
-
-module.exports = {
-    MultiDbORM: MultiDbORM
+const { Sync } = require('../sync')
+const { Metrics } = require('./metrics')
+class MultiDbORM {
+
+    db
+    dbType
+    reqMade
+    lastQLatency
+    loglevel = 0
+    sync
+    metrics
+
+    constructor(db) {
+        this.db = db
+        this.sync = new Sync()
+        this.metrics = new Metrics(this.loglevel)
+    }
+
+    setLogLevel(level) {
+        this.loglevel = level;
+        this.metrics.setLogLevel(level);
+    }
+
+    async connect() {
+
+    }
+
+    setdb(db) {
+        this.reqMade = 0
+        this.db = db;
+    }
+
+    getdb() {
+        this.reqMade++
+        return this.db;
+    }
+
+    async get(modelname, filter) {
+        if (this.loglevel > 4)
+            console.log("Not implemented")
+    }
+
+    async getOne(modelname, filter) {
+        if (this.loglevel > 4)
+            console.log("Not implemented")
+    }
+
+    async create(modelname, object) {
+        if (this.loglevel > 4)
+            console.log("Not implemented")
+    }
+
+    async insert(modelname, object) {
+        if (this.loglevel > 4)
+            console.log("Not implemented")
+    }
+
+    async update(modelname, filter, object) {
+        if (this.loglevel > 4)
+            console.log("Not implemented")
+    }
+
+    async delete(modelname, filter) {
+        if (this.loglevel > 4)
+            console.log("Not implemented")
+    }
+
+}
+
+
+module.exports = {
+    MultiDbORM: MultiDbORM
 }

package/engines/mysqldb.d.ts

@@ -1,25 +1,25 @@
-import { MultiDbORM } from './multidb';
-
-export type MySQLDBConfig = {
-    host: string;
-    port: string;
-    username: string;
-    password: string;
-    database: string;
-    connectionLimit?: Number;
-    connectTimeout?: Number;
-    acquireTimeout?: Number;
-    timeout?: Number;
-}
-
-export class MySQLDB extends MultiDbORM {
-    db: typeof import('mysql')
-    mysql: typeof import('mysql');
-    connection: import('mysql').Connection;
-
-    constructor(credentials: MySQLDBConfig);
-
-    run(query: string): Promise<any[]>;
-
-    closePool(): void;
-}
+import { MultiDbORM } from './multidb';
+
+export type MySQLDBConfig = {
+    host: string;
+    port: string;
+    username: string;
+    password: string;
+    database: string;
+    connectionLimit?: Number;
+    connectTimeout?: Number;
+    acquireTimeout?: Number;
+    timeout?: Number;
+}
+
+export class MySQLDB extends MultiDbORM {
+    db: typeof import('mysql')
+    mysql: typeof import('mysql');
+    connection: import('mysql').Connection;
+
+    constructor(credentials: MySQLDBConfig);
+
+    run(query: string): Promise<any[]>;
+
+    closePool(): void;
+}

package/engines/mysqldb.js

@@ -64,7 +64,7 @@ class MySQLDB extends MultiDbORM {
   }
 
   async get(modelname, filter, options) {
-    this.metrics.get(modelname, filter, options);
+    const span = this.metrics.getSpan();
     var where = "";
     for (var key in filter) {
       where = where + `${key} = '${filter[key]}' AND `;
@@ -100,11 +100,13 @@ class MySQLDB extends MultiDbORM {
       offset = `OFFSET ${options.offset}`;
     }
     var query = `SELECT * FROM ${modelname} WHERE ${where} ${sort} ${limit} ${offset};`;
-    return (await this.run(query)) || [];
+    const res = (await this.run(query)) || [];
+    this.metrics.get(modelname, filter, options, span);
+    return res;
   }
 
   async getOne(modelname, filter) {
-    this.metrics.getOne(modelname, filter);
+    const span = this.metrics.getOneSpan();
     var where = "";
     for (var key in filter) {
       where = where + `${key} = '${filter[key]}' AND `;
@@ -112,11 +114,12 @@ class MySQLDB extends MultiDbORM {
     where = where + " 1 ";
     var query = `SELECT * FROM ${modelname} WHERE ${where} LIMIT 1;`;
     var row = await this.run(query);
+    this.metrics.getOne(modelname, filter, span);
     return row[0];
   }
   async create(modelname, sampleObject) {
     this.sync.create(modelname, sampleObject);
-    this.metrics.create(modelname, sampleObject);
+    const span = this.metrics.createSpan();
 
     var cols = "";
     for (var key in sampleObject) {
@@ -144,7 +147,9 @@ class MySQLDB extends MultiDbORM {
     cols = cols.substring(0, cols.length - 1);
     var query = `CREATE TABLE IF NOT EXISTS ${modelname} (${cols});`;
     try {
-      return await this.run(query);
+      const res = await this.run(query);
+      this.metrics.create(modelname, sampleObject, span);
+      return res;
     } catch (err) {
       if (this.loglevel > 0) console.log(err);
       throw err;
@@ -153,7 +158,7 @@ class MySQLDB extends MultiDbORM {
 
   async insert(modelname, object) {
     this.sync.insert(modelname, object);
-    this.metrics.insert(modelname, object);
+    const span = this.metrics.insertSpan();
     var cols = "";
     var vals = "";
     for (var key in object) {
@@ -171,11 +176,15 @@ class MySQLDB extends MultiDbORM {
     var query = `INSERT INTO ${modelname} (${cols}) VALUES(${vals});`;
 
     try {
-      return await this.run(query);
+      const res = await this.run(query);
+      this.metrics.insert(modelname, object, span);
+      return res;
     } catch (err) {
       if (err.code && err.code === "ER_NO_SUCH_TABLE") {
         await this.create(modelname, object);
-        return await this.run(query);
+        const res = await this.run(query);
+        this.metrics.insert(modelname, object, span);
+        return res;
       } else {
         throw err;
       }
@@ -184,7 +193,7 @@ class MySQLDB extends MultiDbORM {
 
   async update(modelname, filter, object) {
     this.sync.update(modelname, filter, object);
-    this.metrics.update(modelname, filter, object);
+    const span = this.metrics.updateSpan();
 
     var where = "";
     var vals = "";
@@ -212,7 +221,9 @@ class MySQLDB extends MultiDbORM {
 
     var query = `UPDATE ${modelname} SET ${vals} WHERE ${where};`;
     try {
-      return await this.run(query);
+      const res = await this.run(query);
+      this.metrics.update(modelname, filter, object, span);
+      return res;
     } catch (e) {
       if (this.loglevel > 4) console.log("Error in update", e);
       throw e;
@@ -221,7 +232,7 @@ class MySQLDB extends MultiDbORM {
 
   async delete(modelname, filter) {
     this.sync.delete(modelname, filter);
-    this.metrics.delete(modelname, filter);
+    const span = this.metrics.deleteSpan();
 
     var where = "";
     for (var key in filter) {
@@ -229,7 +240,9 @@ class MySQLDB extends MultiDbORM {
     }
     where = where + " 1 ";
     var query = `DELETE FROM ${modelname} WHERE ${where};`;
-    return await this.run(query);
+    const res = await this.run(query);
+    this.metrics.delete(modelname, filter, span);
+    return res;
   }
 
   closePool() {

package/engines/oracledb.d.ts

@@ -1,24 +1,24 @@
-import { MultiDbORM } from './multidb';
-
-export interface OracleDBConfig {
-    username: string;
-    password: string;
-    net_service_name: string;
-    wallet_dir: string;
-    connection_pool_name?: string;
-    wallet_password?: string;
-    lib_dir?: string;
-}
-
-export declare class OracleDB extends MultiDbORM {
-    db: typeof import('oracledb')
-    connection_pool_name: string;
-    schema: string;
-    pool_creation: Promise<any>;
-
-    constructor(config: OracleDBConfig);
-
-    connect(): Promise<void>;
-
-    run(query: string): Promise<any>;
-}
+import { MultiDbORM } from './multidb';
+
+export interface OracleDBConfig {
+    username: string;
+    password: string;
+    net_service_name: string;
+    wallet_dir: string;
+    connection_pool_name?: string;
+    wallet_password?: string;
+    lib_dir?: string;
+}
+
+export declare class OracleDB extends MultiDbORM {
+    db: typeof import('oracledb')
+    connection_pool_name: string;
+    schema: string;
+    pool_creation: Promise<any>;
+
+    constructor(config: OracleDBConfig);
+
+    connect(): Promise<void>;
+
+    run(query: string): Promise<any>;
+}