@bee.js/node 0.0.84 → 0.0.86

package/beehive.js

@@ -372,8 +372,6 @@ module.exports = function hive(req = {}, res = {}, model = null) {
     },
 
     insert: async function (_data, params = {}) {
-      //data = beeORM.forceData(data, req)
-
       if (model.relations && params.relations)
         await Promise.all(
           Object.keys(model.relations).map(async (field) => {
@@ -401,10 +399,10 @@ module.exports = function hive(req = {}, res = {}, model = null) {
           })
         );
 
-      let onlyFields = script[0].fields.concat(
+      const onlyFields = script[0].fields.concat(
         (req.onlyFields || {})[model.table] || []
       );
-      let sql = beeORM.sqlInsertUpdate(model, _data, onlyFields, "INSERT");
+      const sql = beeORM.sqlInsertUpdate(model, _data, onlyFields, "INSERT");
 
       _data = await dbExec(sql.SQL, sql.binds);
 
@@ -415,21 +413,17 @@ module.exports = function hive(req = {}, res = {}, model = null) {
     },
 
     update: async function (data, ids = []) {
-      // TODO criar auditoria
-
-      //data = beeORM.forceData(data, req)
-
-      let onlyFields = script[0].fields.concat(
+      const onlyFields = script[0].fields.concat(
         (req.onlyFields || {})[model.table] || []
       );
-      let sql = beeORM.sqlInsertUpdate(model, data, onlyFields, "UPDATE");
+      const sql = beeORM.sqlInsertUpdate(model, data, onlyFields, "UPDATE");
 
       sql.SQL += beeORM.modelSqlWhere(model, ids, req.middleware);
       sql.SQL += script[0]["where"].length
         ? (!ids.length ? " WHERE " : " AND ") + script[0]["where"].join(" AND ")
         : "";
 
-      data = await dbExec(sql.SQL, script[0]["binds"]);
+      data = await dbExec(sql.SQL, sql.binds);
 
       return { ...this, result: { ...sql.result, ...data } };
     },

package/lib/ORM/beeORM.js

@@ -1,10 +1,6 @@
 const mysql = require("mysql2/promise"); //https://evertpot.com/executing-a-mysql-query-in-nodejs/
 const beeTools = require("../../tools/beeTools");
 
-const escape = function (string) {
-  return typeof string === "string" ? string.replace(/'/g, "''") : string;
-};
-
 const parseArray = function (param) {
   switch (typeof param) {
     case "string":
@@ -216,6 +212,15 @@ module.exports = {
 
     data = data[0] ? data : [data];
 
+    const sanitizeString = (val) => {
+      return typeof val === "string" ? val.replace(/\0/g, "") : val;
+    };
+
+    const normalizeDate = (val) => {
+      if (!val || val === "" || isNaN(new Date(val).getTime())) return null;
+      return val;
+    };
+
     Object.keys(data).map((key) => {
       for (let field in model.schema) {
         field = { ...model.schema[field], name: field };
@@ -224,7 +229,7 @@ module.exports = {
         if (!field.ai && onlyFields.length && !onlyFields.includes(field.name))
           continue;
 
-        let value = escape(data[key][field.name]);
+        let value = data[key][field.name];
         let type = model.schema[field.name].type;
 
         if (statement == "INSERT" && field.ai)
@@ -242,26 +247,24 @@ module.exports = {
         switch (type) {
           case "guid":
           case "uuid":
-            value = `UUID_TO_BIN('${value}')`; //TODO mssql
-            break;
-          case "binary":
-            value = value;
-            break;
-          case "file":
             binds.push(value);
-            value = "?";
+            value = `UUID_TO_BIN(?)`;
             break;
           case "date":
           case "datetime":
           case "time":
           case "timestamp":
-            value = value ? q(value, "''") : "null";
+            binds.push(normalizeDate(value));
+            value = "?";
             break;
+          case "binary":
+          case "file":
           default:
-            value = q(value, "''");
+            binds.push(value);
+            value = "?";
         }
 
-        if (field.onInput) value = field.onInput + "(" + value + ")";
+        if (field.onInput) value = `${field.onInput}(${value})`; //example md5()
 
         if (statement === "INSERT") {
           if (key == 0) fields.push(q(field.name));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bee.js/node",
-  "version": "0.0.84",
+  "version": "0.0.86",
   "description": "A JavaScript framework for making Node.js API´s",
   "main": "index.js",
   "scripts": {