multi-db-orm 3.0.1 → 3.0.3

package/engines/hanadb.js

@@ -2,7 +2,7 @@ const { MultiDbORM } = require("./multidb");
 
 class HanaDB extends MultiDbORM {
   db;
-  conn;
+  pool;
   dataMap = {
     id: "VARCHAR(50) NOT NULL PRIMARY KEY",
     string: "NVARCHAR(4000)",
@@ -34,8 +34,8 @@ class HanaDB extends MultiDbORM {
         idleTimeout: credentials.timeout || 60000,
       },
     };
-    this.conn = hana.createConnection();
-    this.db = this.conn;
+    this.pool = hana.createPool(this.conn_params);
+    this.db = this.pool;
     this.dbType = "hana";
     this.reqMade = 0;
   }
@@ -44,24 +44,18 @@ class HanaDB extends MultiDbORM {
     const that = this;
     this.reqMade++;
     return new Promise((resolve, reject) => {
-      let onConnect = function (err) {
-        if (err) throw err;
-        that.conn.exec(query, (err, result) => {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(result);
-          }
-          if (that.loglevel > 3) {
-            console.log("Query", query, "->", result);
-          }
-        });
-      };
-      if (that.conn.state() == "disconnected") {
-        that.conn.connect(that.conn_params, onConnect);
-      } else {
-        onConnect();
-      }
+      var conn = this.pool.getConnection();
+      conn.exec(query, (err, result) => {
+        conn.disconnect();
+        if (err) {
+          reject(err);
+        } else {
+          resolve(result);
+        }
+        if (that.loglevel > 3) {
+          console.log("Query", query, "->", result);
+        }
+      });
     });
   }
 
@@ -69,22 +63,22 @@ class HanaDB extends MultiDbORM {
     this.metrics.get(modelname, filter, options);
     let where = "";
     for (const key in filter) {
-      where += `${key} = '${filter[key]}' AND `;
+      where += `"${key}" = '${filter[key]}' AND `;
     }
     where += "1 = 1";
     let sort = "";
     if (options) {
       if (options.apply) {
         if (options.apply.ineq) {
-          where += ` AND ${options.apply.field} ${options.apply.ineq.op} '${options.apply.ineq.value}'`;
+          where += ` AND "${options.apply.field}" ${options.apply.ineq.op} '${options.apply.ineq.value}'`;
         }
         if (options.apply.sort) {
-          sort = `ORDER BY ${options.apply.field} ${options.apply.sort}`;
+          sort = `ORDER BY "${options.apply.field}" ${options.apply.sort}`;
         }
       } else if (options.sort) {
         sort = "ORDER BY";
         for (let i = 0; i < options.sort.length; i++) {
-          sort += ` ${options.sort[i].field} ${options.sort[i].order}`;
+          sort += ` "${options.sort[i].field}" ${options.sort[i].order}`;
           if (i < options.sort.length - 1) {
             sort += ", ";
           }
@@ -108,7 +102,7 @@ class HanaDB extends MultiDbORM {
     this.metrics.getOne(modelname, filter);
     let where = "";
     for (const key in filter) {
-      where += `${key} = '${filter[key]}' AND `;
+      where += `"${key}" = '${filter[key]}' AND `;
     }
     where += "1 = 1";
     const query = `SELECT * FROM ${modelname} WHERE ${where} LIMIT 1;`;
@@ -138,9 +132,9 @@ class HanaDB extends MultiDbORM {
       }
 
       if (key.toLowerCase().trim() === "id") {
-        cols += `${key} ${type} PRIMARY KEY NOT NULL ,`;
+        cols += `"${key}" ${type} PRIMARY KEY NOT NULL ,`;
       } else {
-        cols += `${key} ${type},`;
+        cols += `"${key}" ${type},`;
       }
     }
     cols = cols.substring(0, cols.length - 1);
@@ -159,7 +153,7 @@ class HanaDB extends MultiDbORM {
     let cols = "";
     let vals = "";
     for (const key in object) {
-      cols = cols + `${key},`;
+      cols = cols + `"${key}",`;
       let val = object[key];
       if (typeof val == "object") val = JSON.stringify(object[key]);
       val = this.escapeSQLValue(val);
@@ -193,7 +187,7 @@ class HanaDB extends MultiDbORM {
     let where = "";
     let vals = "";
     for (const key in filter) {
-      where += `${key} = '${filter[key]}' AND `;
+      where += `"${key}" = '${filter[key]}' AND `;
     }
     for (const key in object) {
       let val = object[key];
@@ -201,7 +195,7 @@ class HanaDB extends MultiDbORM {
         val = JSON.stringify(object[key]);
       val = this.escapeSQLValue(val);
 
-      vals += `${key} = ${val},`;
+      vals += `"${key}" = ${val},`;
     }
     where += "1 = 1";
     vals = vals.slice(0, -1);
@@ -221,7 +215,7 @@ class HanaDB extends MultiDbORM {
 
     let where = "";
     for (const key in filter) {
-      where += `${key} = '${filter[key]}' AND `;
+      where += `"${key}" = '${filter[key]}' AND `;
     }
     where += "1 = 1";
     const query = `DELETE FROM ${modelname} WHERE ${where};`;
@@ -230,7 +224,7 @@ class HanaDB extends MultiDbORM {
 
   closePool() {
     return new Promise((resolve, reject) => {
-      this.conn.disconnect((err) => {
+      this.pool.disconnect((err) => {
         if (err) {
           reject(err);
           if (this.loglevel > 1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multi-db-orm",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "CRUD , Backup , Restore and Migration library for multiple databases",
   "main": "index.js",
   "dependencies": {
@@ -47,4 +47,4 @@
     "url": "https://github.com/shiveshnavin/multi-db-orm/issues"
   },
   "homepage": "https://github.com/shiveshnavin/multi-db-orm#readme"
-}
+}