@areumtecnologia/mysql-db-handler 1.0.9 → 1.0.10

package/index.js

@@ -1,4 +1,5 @@
 // Áreum Tecnologia - Renan Moreira - renan.moreira@areum.com.br
+const DataBaseCache = require('./lib/database-cache');
 const DataBase = require('./lib/database');
 const DataBaseHandler = require('./lib/databaseHandler');
 // We do not export the singleton by default in a library usually, 
@@ -6,5 +7,6 @@ const DataBaseHandler = require('./lib/databaseHandler');
 
 module.exports = {
     DataBase,
-    DataBaseHandler
+    DataBaseHandler,
+    DataBaseCache
 };

package/lib/database-cache.js

@@ -2,7 +2,7 @@
 const mysql = require('mysql2/promise');
 const NodeCache = require('node-cache');
 
-class DataBase {
+class DataBaseCache {
     constructor(config = {}) {
         this.config = config;
         this.pool = mysql.createPool(this.config); // The pool is created once when the instance is created.
@@ -74,4 +74,4 @@ class DataBase {
     }
 }
 
-module.exports = DataBase;
+module.exports = DataBaseCache;

package/lib/database.js

@@ -31,8 +31,9 @@ class DataBase {
      * Executes a SQL query using a pooled connection.
      * @param {string} sql - The SQL query to execute.
      * @param {Array} [params] - The parameters for the SQL query.
-     * @returns {Promise<Array>} The result set from the query.
-     * @throws {Error} Throws an error if the query fails.
+     * @returns {Promise<Array|{error: Error}>} The result set from the query,
+     *         or an object with an `error` property if the query fails.
+     *         This prevents unhandled exceptions from crashing the application.
      */
     async query(sql, params) {
         let connection; // Mova a declaração da conexão para fora do bloco try
@@ -44,9 +45,12 @@ class DataBase {
             const [rows] = await connection.query(sql, params);
             return rows;
         } catch (error) {
-            // Passo 3: Se a query falhar, logar e retornar o erro no formato desejado
+            // Passo 3: Logar o erro para diagnóstico
             console.error('Erro na execução da query:', error);
-            return { error }; // Mantém o retorno do erro como um objeto
+
+            // Retorna o erro encapsulado em { error } para evitar crashes não tratados,
+            // mantendo o contrato documentado no README.
+            return { error };
         } finally {
             // Passo 4: Este bloco SEMPRE será executado, independentemente de sucesso ou falha no 'try'
             if (connection) {

package/lib/databaseHandler.js

@@ -49,16 +49,37 @@ class DatabaseHandler {
         const bindings = [];
         for (const item of strictCondition) {
             if (typeof item === 'string') {
+                // Operadores lógicos (AND / OR) são inseridos como-is, sem parênteses.
                 clauses.push(item.toUpperCase());
             } else if (typeof item === 'object' && item !== null) {
                 const key = Object.keys(item).find(k => k !== 'operator');
                 if (!key) continue;
                 const value = item[key];
-                const operator = item.operator || '=';
-                clauses.push(`\`${key}\` ${operator} ?`);
-                bindings.push(value);
+                let operator = item.operator || '=';
+                let upperOp = String(operator).toUpperCase();
+
+                // Suporte a arrays => IN / NOT IN (consistente com _buildWhereClause)
+                if (Array.isArray(value) && upperOp === '=') {
+                    operator = 'IN';
+                    upperOp = 'IN';
+                }
+
+                if (Array.isArray(value) && (upperOp === 'IN' || upperOp === 'NOT IN')) {
+                    if (value.length === 0) {
+                        clauses.push(upperOp === 'IN' ? '1 = 0' : '1 = 1');
+                    } else {
+                        const placeholders = value.map(() => '?').join(', ');
+                        clauses.push(`\`${key}\` ${operator} (${placeholders})`);
+                        bindings.push(...value);
+                    }
+                } else {
+                    clauses.push(`\`${key}\` ${operator} ?`);
+                    bindings.push(value);
+                }
             }
         }
+        // Junta com espaço para preservar operadores AND/OR intercalados.
+        // Ex: "(a = ? AND b = ?)" em vez de "(a = ? b = ?)" que era inválido.
         return { sql: `(${clauses.join(' ')})`, bindings };
     }
 
@@ -182,12 +203,31 @@ class DatabaseHandler {
             // --- Queries ---
             const baseWhereSql = baseWhere.sql ? `WHERE ${baseWhere.sql}` : '';
             const totalCountSql = `SELECT COUNT(*) as total FROM ${this.table} ${baseWhereSql}`;
-            const [totalResult] = await this.executeQuery(totalCountSql, baseWhere.bindings);
-            const recordsTotal = totalResult.total;
+            const totalResult = await this.executeQuery(totalCountSql, baseWhere.bindings);
+            // Contrato: executeQuery propaga { error } em caso de falha (não lança).
+            if (totalResult && totalResult.error) {
+                return {
+                    draw: parseInt(draw || 0),
+                    recordsTotal: 0,
+                    recordsFiltered: 0,
+                    data: [],
+                    error: totalResult.error.message
+                };
+            }
+            const recordsTotal = (totalResult && totalResult[0] && totalResult[0].total) || 0;
 
             const filteredCountSql = `SELECT COUNT(*) as total FROM ${this.table} ${whereSql}`;
-            const [filteredResult] = await this.executeQuery(filteredCountSql, finalBindings);
-            const recordsFiltered = filteredResult.total;
+            const filteredResult = await this.executeQuery(filteredCountSql, finalBindings);
+            if (filteredResult && filteredResult.error) {
+                return {
+                    draw: parseInt(draw || 0),
+                    recordsTotal: parseInt(recordsTotal),
+                    recordsFiltered: 0,
+                    data: [],
+                    error: filteredResult.error.message
+                };
+            }
+            const recordsFiltered = (filteredResult && filteredResult[0] && filteredResult[0].total) || 0;
 
             // CORREÇÃO: Construção segura da cláusula SELECT para evitar vírgulas duplas.
             const selectFields = ['*'];
@@ -197,6 +237,15 @@ class DatabaseHandler {
             }
             const dataSql = `SELECT ${selectFields.join(', ')} FROM ${this.table} ${whereSql} ${orderSql} ${limitSql}`;
             const data = await this.executeQuery(dataSql, finalBindings);
+            if (data && data.error) {
+                return {
+                    draw: parseInt(draw || 0),
+                    recordsTotal: parseInt(recordsTotal),
+                    recordsFiltered: parseInt(recordsFiltered),
+                    data: [],
+                    error: data.error.message
+                };
+            }
 
             return {
                 draw: parseInt(draw || 0),

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@areumtecnologia/mysql-db-handler",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "A powerful MySQL wrapper with connection pooling, singleton support, and advanced query handling for Node.js.",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node tests/update_operators.test.js && node tests/selectToDatatable.test.js"
   },
   "author": "Renan Moreira / Áreum Tecnologia",
   "license": "MIT",
   "dependencies": {
-    "mysql2": "^3.22.5"
+    "mysql2": "^3.23.1"
   }
 }

package/lib/database-singleton.js

@@ -1,19 +0,0 @@
-// Áreum Tecnologia - Renan Moreira - renan.moreira@areum.com.br
-// src/database/database-singleton.js
-// Exemplo Singleton para a conexão com o banco de dados
-const { DB_HOST, DB_USER, DB_PASS } = require('../constants');
-const DataBase = require("./database");
-
-const dbi = new DataBase({
-    host: DB_HOST,
-    user: DB_USER,
-    password: DB_PASS,
-    database: '',
-    charset: "utf8mb4",
-    timezone: "-03:00",
-    connectionLimit: 1, // Ajustado para um limite de conexão mais comum
-    waitForConnections: true,
-    queueLimit: 0
-});
-// console.log("DATABASE SINGLETON CREATED", dbi.id);
-module.exports = dbi;