exodus-framework 2.1.1017 → 2.1.1018

package/lib/utils/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAIzF,eAAO,MAAM,MAAM,WASjB,CAAC;AAuGH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAwCjB;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,EAClC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,iBAalD"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEzF,eAAO,MAAM,MAAM,WASjB,CAAC;AAqIH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAqDjB;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,EAClC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,iBAalD"}

package/lib/utils/database.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.InsertIndexes = InsertIndexes;
 exports.mainDb = void 0;
 exports.processFilters = processFilters;
+var _dateFns = require("date-fns");
 var _sequelize = require("sequelize");
 var _core = _interopRequireDefault(require("../app/core"));
 var _error = require("../app/error");
-var _dateFns = require("date-fns");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const mainDb = exports.mainDb = new _sequelize.Sequelize({
   database: _core.default.settings.getDatabase().main.database,
@@ -23,7 +23,7 @@ const mainDb = exports.mainDb = new _sequelize.Sequelize({
   timezone: '-03:00',
   logging: _core.default.settings.getDatabase().service.log
 });
-function processCondition(cond) {
+function processCondition(cond, fieldName) {
   if ('or' in cond) {
     return {
       [_sequelize.Op.or]: cond.or.map(subCond => processCondition(subCond))
@@ -51,12 +51,32 @@ function processCondition(cond) {
     simpleWhere[_sequelize.Op.notBetween] = cond.type === 'DATE' ? cond.notBetween.map(d => new Date(d)) : cond.notBetween;
   }
   if (cond.like !== undefined) {
-    const operator = cond.caseInsensitive ? _sequelize.Op.iLike : _sequelize.Op.like;
-    simpleWhere[operator] = cond.type === 'DATE' ? new Date(cond.like) : cond.like;
+    const value = cond.type === 'DATE' ? new Date(cond.like) : cond.like;
+    if (cond.caseInsensitive && fieldName) {
+      const dialect = _core.default.settings.getDatabase().main.dialect;
+      if (dialect === 'postgres') {
+        simpleWhere[_sequelize.Op.iLike] = value;
+      } else {
+        // Para MariaDB/MySQL, usamos Sequelize.where com função LOWER
+        return _sequelize.Sequelize.where(_sequelize.Sequelize.fn('LOWER', _sequelize.Sequelize.col(fieldName)), _sequelize.Op.like, `${value}`.toLowerCase());
+      }
+    } else {
+      simpleWhere[_sequelize.Op.like] = value;
+    }
   }
   if (cond.notLike !== undefined) {
-    const operator = cond.caseInsensitive ? _sequelize.Op.notILike : _sequelize.Op.notLike;
-    simpleWhere[operator] = cond.type === 'DATE' ? new Date(cond.notLike) : cond.notLike;
+    const value = cond.type === 'DATE' ? new Date(cond.notLike) : cond.notLike;
+    if (cond.caseInsensitive && fieldName) {
+      const dialect = _core.default.settings.getDatabase().main.dialect;
+      if (dialect === 'postgres') {
+        simpleWhere[_sequelize.Op.notILike] = value;
+      } else {
+        // Para MariaDB/MySQL, usamos Sequelize.where com função LOWER
+        return _sequelize.Sequelize.where(_sequelize.Sequelize.fn('LOWER', _sequelize.Sequelize.col(fieldName)), _sequelize.Op.notLike, `${value}`.toLowerCase());
+      }
+    } else {
+      simpleWhere[_sequelize.Op.notLike] = value;
+    }
   }
   if (cond.in !== undefined) {
     simpleWhere[_sequelize.Op.in] = cond.type === 'DATE' ? cond.in.map(d => new Date(d)) : cond.in;
@@ -131,7 +151,7 @@ function processFilters(filters) {
       for (const c of condition) {
         const [[key, value]] = Object.entries(c);
         t.push({
-          [key]: processCondition(value)
+          [key]: processCondition(value, key)
         });
       }
       if (!where[logicalOp]) {
@@ -148,14 +168,23 @@ function processFilters(filters) {
         const [k, c] = processDateCondition(key, condition);
         where[k] = c;
       } else {
-        const processedCondition = processCondition(condition);
-        if (where[field]) {
-          where[field] = {
-            ...where[field],
-            ...processedCondition
-          };
+        const processedCondition = processCondition(condition, key);
+
+        // Se retornar um Sequelize.where (case insensitive para MariaDB), precisamos tratar diferente
+        if (processedCondition && typeof processedCondition === 'object' && processedCondition.comparator) {
+          // É um Sequelize.where
+          where[_sequelize.Op.and] = where[_sequelize.Op.and] || [];
+          where[_sequelize.Op.and].push(processedCondition);
         } else {
-          where[field] = processedCondition;
+          // Condição normal
+          if (where[field]) {
+            where[field] = {
+              ...where[field],
+              ...processedCondition
+            };
+          } else {
+            where[field] = processedCondition;
+          }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exodus-framework",
-  "version": "2.1.1017",
+  "version": "2.1.1018",
   "description": "Exodus Framework",
   "author": "jhownpaixao",
   "license": "ISC",