db-crud-api 0.3.26 → 0.3.27

package/lib/mssql.js

@@ -124,7 +124,9 @@ export async function query(connection, dbOpes) {
         pool = new sql.ConnectionPool(connection);  // Create new pool
         try {
             await pool.connect();  // wait that connection are made
-        } catch (err) { throw (err); } // using original error
+        } catch (err) { 
+            throw (err); // using original error
+        } 
         pools[connection.id] = pool;  // add new pool to pools
     }
 

package/lib/mysql.js

@@ -14,7 +14,7 @@ const pools = {};
 function stringifyValue(fieldName, value, tSchema) {
 
     // null or undefined
-    if (value == undefined)  
+    if (value == undefined)
         return 'null';
 
     // detect field type
@@ -26,7 +26,7 @@ function stringifyValue(fieldName, value, tSchema) {
     // if datetime
     if (_fieldType == 'datetime') {
         // my-sql not accepts 'Z' at end of ISO string
-        if (value instanceof Date) 
+        if (value instanceof Date)
             return `\'${value.toISOString().slice(0, -1)}\'`;
         if (typeof value == 'string') {
             const valueDate = new Date(Date.parse(value));
@@ -34,9 +34,9 @@ function stringifyValue(fieldName, value, tSchema) {
         }
         return value;
     }
-                
+
     // if boolean
-    if (_fieldType == 'boolean' && typeof value == 'boolean') 
+    if (_fieldType == 'boolean' && typeof value == 'boolean')
         return `\'${value}\'`;
 
     // if string or uuid
@@ -49,11 +49,11 @@ function stringifyValue(fieldName, value, tSchema) {
 
     // field not in schema
     if (_fieldType == undefined) {
-        if (value instanceof Date) 
+        if (value instanceof Date)
             return `\'${value.toISOString().slice(0, -1)}\'`;
-        if (typeof value == 'boolean') 
+        if (typeof value == 'boolean')
             return `\'${value}\'`;
-        if (typeof value == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') 
+        if (typeof value == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"')
             return sql.escape(`${value}`);
     }
 
@@ -103,15 +103,20 @@ export async function closeAllConnections() {
 
 // Test connection
 export async function testConnection(connection) {
-  try {
-    const _connection = await sql.createConnection(connection);
-    await _connection.end();
-    return true;
-  } 
-  catch (error) 
-  {
-    throw (error);
-  }
+    let _pool;
+    try {
+        // const _connection = await sql.createConnection(connection);
+        // await _connection.end();
+        _pool = new sql.createPool(connection);  // Create new pool
+        await _pool.query('SELECT 1');
+        return true;
+    }
+    catch (error) {
+        throw (error);
+    }
+    finally {
+        if (_pool) await _pool.end();
+    }
 }
 
 // Query
@@ -129,14 +134,14 @@ export async function query(connection, dbOpes) {
     let appLog = true;
     // if exists, input params will be added to request
     if (Array.isArray(dbOpes)) {
-        dbOpes.forEach((dbOpe, index) => { 
+        dbOpes.forEach((dbOpe, index) => {
             sqlString += ToSql(dbOpe, pool);
-            if (dbOpe?.hasOwnProperty('appLog') && dbOpe.appLog === false) appLog = false; 
+            if (dbOpe?.hasOwnProperty('appLog') && dbOpe.appLog === false) appLog = false;
         });
     }
     else {
         sqlString += ToSql(dbOpes, pool);
-        if (dbOpes?.hasOwnProperty('appLog') && dbOpes.appLog === false) appLog = false; 
+        if (dbOpes?.hasOwnProperty('appLog') && dbOpes.appLog === false) appLog = false;
     }
 
     sqlString = normalizeSpecialName(sqlString);
@@ -149,13 +154,14 @@ export async function query(connection, dbOpes) {
 
     // Run query
     let sqlresult = undefined;
-    let sqlconn = undefined;
+    //let sqlconn = undefined;
     try {
-        sqlconn = await pool.getConnection();
-        sqlresult = await sqlconn.query(sqlString);
+        //    sqlconn = await pool.getConnection();
+        //    sqlresult = await sqlconn.query(sqlString);
+        sqlresult = await pool.query(sqlString);
     }
     catch (err) { throw (err); } // using original error
-    finally { if (sqlconn) sqlconn.release(); }
+    // finally { if (sqlconn) sqlconn.release(); }
 
     // Log
     if (appLog) {
@@ -182,7 +188,7 @@ function normalizeSpecialName(sql) {
         // Gestione delle virgolette singole '
         if (char === "'" && !inDoubleQuote) {
             inSingleQuote = !inSingleQuote;
-        } 
+        }
         // Gestione delle virgolette doppie "
         else if (char === '"' && !inSingleQuote) {
             inDoubleQuote = !inDoubleQuote;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db-crud-api",
-  "version": "0.3.26",
+  "version": "0.3.27",
   "type": "module",
   "description": "CRUD api for database tables",
   "main": "index.js",