db-crud-api 0.3.10 → 0.3.12

package/lib/mssql.js

@@ -13,7 +13,7 @@ function stringifyValue(fieldName, value, tSchema) {
     if (value == undefined) { return 'null' }
     if (typeof value !== 'string' || value.trimStart().charAt(0) !== '[') {
         if (tSchema.table.fields && tSchema.table.fields[fieldName] && tSchema.table.fields[fieldName].type) {
-            if (tSchema.table.fields[fieldName].type == 'datetime') { 
+            if (tSchema.table.fields[fieldName].type == 'datetime') {
                 if (typeof value == 'datetime' || typeof value == 'object') return `\'${value.toISOString()}\'`;
                 if (typeof value == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') return `\'${value}\'`;
                 return value;
@@ -35,7 +35,7 @@ function stringifyValue(fieldName, value, tSchema) {
 export function prepareConnection(tSchema) {
     return {
         id: `${tSchema.server.realName}-${tSchema.database.realName}-${tSchema.server.user}`,
-        server: ((tSchema.server.instance && tSchema.server.instance != 'DEFAULT') ? (tSchema.server.realName + '\\' + tSchema.server.instance) : tSchema.server.realName)  ?? 'localhost',
+        server: ((tSchema.server.instance && tSchema.server.instance != 'DEFAULT') ? (tSchema.server.realName + '\\' + tSchema.server.instance) : tSchema.server.realName) ?? 'localhost',
         port: tSchema.server.port,
         user: tSchema.server.user,
         password: tSchema.server.password,
@@ -64,12 +64,31 @@ export async function closeAllConnections() {
         if (!pools.hasOwnProperty(poolId)) continue;
         let pool = pools[poolId];
         if (pool) {
-           await pool.close();  // wait pool is closed
-           pool = undefined;  // remove pool from pools
+            await pool.close();  // wait pool is closed
+            pool = undefined;  // remove pool from pools
         }
     }
 }
 
+// Test connection
+export async function testConnection(connection) {
+
+    let _connection;
+    try {
+        _connection = await sql.connect(connection);
+        return true;
+    }
+    catch (error) {
+        throw (error);
+    }
+    finally {
+        if (_connection) {
+            await _connection.close();
+        }
+    }
+
+}
+
 // Query
 export async function query(connection, dbOpes) {
 
@@ -77,8 +96,9 @@ export async function query(connection, dbOpes) {
     let pool = pools[connection.id];  // Try to get an existing pool
     if (!pool) {
         pool = new sql.ConnectionPool(connection);  // Create new pool
-        try { await pool.connect();  // wait that connection are made
-        } catch(err) { throw(err); } // using original error
+        try {
+            await pool.connect();  // wait that connection are made
+        } catch (err) { throw (err); } // using original error
         pools[connection.id] = pool;  // add new pool to pools
     }
 
@@ -95,16 +115,16 @@ export async function query(connection, dbOpes) {
     const sqlresult = await sqlRequest.query(sqlString);
 
     // Return a single object if there is only 1 row
-    if (sqlresult.recordsets.length === 0) return;
-    if (sqlresult.recordsets.length === 1) return sqlresult.recordsets[0];
-    else return sqlresult.recordsets;
+    if (sqlresult.recordset.length === 0) return;
+    if (sqlresult.recordset.length === 1) return sqlresult.recordset[0];
+    else return sqlresult.recordset;
 }
 
 // Normalize SpecialName
 function normalizeSpecialName(name) {
     let _odd = false;  // interpreted as 0
     return name.replaceAll('\`', (_m) => {
-        _odd = !_odd; 
+        _odd = !_odd;
         if (_odd) return '[';
         else return ']';
     });
@@ -163,12 +183,12 @@ function getToSql(dbOpe, sqlRequest) {
     let result = 'select'
 
     if (dbOpe.get.options && dbOpe.get.options.length > 0) {
-        if (Array.isArray(dbOpe.get.options)) { for (const s of dbOpe.get.options) { result += ' ' + replaceLIMITToTOP(s); }}
+        if (Array.isArray(dbOpe.get.options)) { for (const s of dbOpe.get.options) { result += ' ' + replaceLIMITToTOP(s); } }
         else result += ' ' + replaceLIMITToTOP(dbOpe.get.options);
     }
 
     if (dbOpe.get.fields && dbOpe.get.fields.length > 0) {
-        if (Array.isArray(dbOpe.get.fields)) result += ' '  + dbOpe.get.fields.join(',') 
+        if (Array.isArray(dbOpe.get.fields)) result += ' ' + dbOpe.get.fields.join(',')
         else result += ' ' + dbOpe.get.fields;
     }
     else { throw new Error('fields is missing.'); }
@@ -197,7 +217,7 @@ function getToSql(dbOpe, sqlRequest) {
 
     if (dbOpe.get.params) addParams(dbOpe.get.params, sqlRequest);
 
-    result += ';' 
+    result += ';'
 
     return result;
 }
@@ -206,8 +226,8 @@ function getToSql(dbOpe, sqlRequest) {
 function patchToSql(dbOpe, sqlRequest) {
     let result = 'update ' + fullyQualifiedTableName(dbOpe.patch.schema);
 
-    if (dbOpe.patch.sets) { 
-        result += ' set ' + Object.entries(dbOpe.patch.sets).map(e => { return e[0] + '=' + stringifyValue(e[0], e[1], dbOpe.patch.schema) }).join(', '); 
+    if (dbOpe.patch.sets) {
+        result += ' set ' + Object.entries(dbOpe.patch.sets).map(e => { return e[0] + '=' + stringifyValue(e[0], e[1], dbOpe.patch.schema) }).join(', ');
     }
     else { throw new Error('sets is missing.'); }
 
@@ -218,7 +238,7 @@ function patchToSql(dbOpe, sqlRequest) {
 
     if (dbOpe.patch.params) addParams(dbOpe.patch.params, sqlRequest);
 
-    result += ';' 
+    result += ';'
 
     return result;
 }
@@ -241,7 +261,7 @@ function putToSql(dbOpe, sqlRequest) {
 
     if (dbOpe.put.params) addParams(dbOpe.put.params, sqlRequest);
 
-    result += ';' 
+    result += ';'
 
     return result;
 }
@@ -257,7 +277,7 @@ function deleteToSql(dbOpe, sqlRequest) {
 
     if (dbOpe.delete.params) addParams(dbOpe.delete.params, sqlRequest);
 
-    result += ';' 
+    result += ';'
 
     return result;
 }
@@ -274,7 +294,7 @@ function executeToSql(dbOpe, sqlRequest) {
 
     if (dbOpe.execute.params) addParams(dbOpe.execute.params, sqlRequest);
 
-    result += ';' 
+    result += ';'
 
     return result;
 }

package/lib/mysql.js

@@ -71,6 +71,19 @@ 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);
+  }
+}
+
 // Query
 export async function query(connection, dbOpes) {
 
@@ -311,4 +324,4 @@ function addParams(params, sqlRequest) {
         }
     }
     return;
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db-crud-api",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "type": "module",
   "description": "CRUD api for database tables",
   "main": "index.js",
@@ -10,9 +10,9 @@
   "author": "FF",
   "license": "MIT",
   "dependencies": {
-    "mssql": "^11.0.1",
-    "mysql2": "^3.12.0",
-    "uuid": "^11.0.3"
+    "mssql": "^12.0.0",
+    "mysql2": "^3.15.3",
+    "uuid": "^11.1.0"
   },
   "keywords": [
     "db",