@bee.js/node 0.0.93 → 0.0.94

package/beehive.js

@@ -40,12 +40,13 @@ module.exports = function hive(req = {}, res = {}, model = null) {
       if (global.configs.debug)
         console.log(
           SQL.replace(
-            /\b(SELECT|FROM|WHERE|INNER JOIN|LEFT JOIN|RIGHT JOIN|GROUP BY|ORDER BY|LIMIT)\b/gi,
+            /\b(SELECT|DELETE|UPDATE|FROM|WHERE|INNER|JOIN|LEFT|RIGHT|GROUP BY|ORDER BY|LIMIT)\b/gi,
             (match) => `\n${match.toUpperCase()}`
           ).replace(
-            /\b(SELECT|FROM|WHERE|INNER|JOIN|LEFT|RIGHT|ON|GROUP BY|ORDER BY|LIMIT|AND|OR|AS|IN|NOT|NULL|IS|DISTINCT|HAVING|UNION|ALL)\b/gi,
+            /\b(SELECT|DELETE|UPDATE|FROM|WHERE|INNER|JOIN|LEFT|RIGHT|ON|GROUP BY|ORDER BY|LIMIT|AND|OR|AS|IN|NOT|NULL|IS|DISTINCT|HAVING|UNION|ALL)\b/gi,
             (match) => `\x1b[1;36m${match.toUpperCase()}\x1b[0m`
-          )
+          ),
+          { binds }
         );
 
       global.beeDBPool = global.beeDBPool || beeORM.createPool(global.configs);
@@ -139,12 +140,11 @@ module.exports = function hive(req = {}, res = {}, model = null) {
 
             relJoin[_parentTable] = !relJoin[_parentTable]
               ? `INNER JOIN ${q(_parentTable)} ON ${q(
-                  _parentTable
-                )}.${_parentField} = ${models[modelName].table}.${_relField} `
+                _parentTable
+              )}.${_parentField} = ${models[modelName].table}.${_relField} `
               : relJoin[_parentTable] +
-                `AND ${q(_parentTable)}.${_parentField} = ${
-                  models[modelName].table
-                }.${_relField} `;
+              `AND ${q(_parentTable)}.${_parentField} = ${models[modelName].table
+              }.${_relField} `;
           }
         }
 
@@ -339,14 +339,10 @@ module.exports = function hive(req = {}, res = {}, model = null) {
 
       fields.map((field) => {
         orderBy.push(
-          `WHEN ${field} = '${string}' THEN ${
-            relevance[0]
-          } WHEN ${field} LIKE '${string}%' THEN ${
-            relevance[1]
-          } WHEN ${field} LIKE '%${string}%' THEN ${
-            relevance[2]
-          } WHEN ${field} LIKE '%${string.replace(/ /g, "%")}%' THEN ${
-            relevance[3]
+          `WHEN ${field} = '${string}' THEN ${relevance[0]
+          } WHEN ${field} LIKE '${string}%' THEN ${relevance[1]
+          } WHEN ${field} LIKE '%${string}%' THEN ${relevance[2]
+          } WHEN ${field} LIKE '%${string.replace(/ /g, "%")}%' THEN ${relevance[3]
           }`
         );
 
@@ -355,12 +351,9 @@ module.exports = function hive(req = {}, res = {}, model = null) {
 
           if (words.length > 1)
             orderBy.push(
-              `WHEN ${field} = '${word}' THEN ${
-                relevance[4] * (i + 1)
-              } WHEN ${field} LIKE '${word}%' THEN ${
-                relevance[4] * (i + 1) + relevance[1]
-              } WHEN ${field} LIKE '%${word}%' THEN ${
-                relevance[4] * (i + 1) + relevance[2]
+              `WHEN ${field} = '${word}' THEN ${relevance[4] * (i + 1)
+              } WHEN ${field} LIKE '${word}%' THEN ${relevance[4] * (i + 1) + relevance[1]
+              } WHEN ${field} LIKE '%${word}%' THEN ${relevance[4] * (i + 1) + relevance[2]
               }`
             );
         });
@@ -420,13 +413,15 @@ module.exports = function hive(req = {}, res = {}, model = null) {
         (req.onlyFields || {})[model.table] || []
       );
       const sql = beeORM.sqlInsertUpdate(model, data, onlyFields, "UPDATE");
+      const where = beeORM.modelSqlWhere(model, ids, req.middleware);
+      const binds = [].concat(sql.binds || [], where.binds || []);
 
-      sql.SQL += beeORM.modelSqlWhere(model, ids, req.middleware);
+      sql.SQL += where.SQL;
       sql.SQL += script[0]["where"].length
         ? (!ids.length ? " WHERE " : " AND ") + script[0]["where"].join(" AND ")
         : "";
 
-      data = await dbExec(sql.SQL, sql.binds);
+      data = await dbExec(sql.SQL, binds);
 
       return { ...this, result: { ...sql.result, ...data } };
     },
@@ -436,13 +431,15 @@ module.exports = function hive(req = {}, res = {}, model = null) {
 
       ids = ids && typeof ids !== "object" ? ids.toString().split(",") : ids;
 
+      const where = beeORM.modelSqlWhere(model, ids, req.middleware);
+
       SQL = "DELETE FROM " + q(model.table);
-      SQL += beeORM.modelSqlWhere(model, ids, req.middleware);
+      SQL += where.SQL
       SQL += script[0]["where"].length
         ? (!ids.length ? " WHERE " : " AND ") + script[0]["where"].join(" AND ")
         : "";
 
-      data = await dbExec(SQL);
+      data = await dbExec(SQL, where.binds);
 
       return this;
     },

package/lib/ORM/beeORM.js

@@ -43,80 +43,74 @@ const modelSqlSelectFields = function (model, onlyFields = []) {
   model.fields
     ? (fields = parseArray(model.fields))
     : Object.keys(model.schema).map((field) => {
-        if (
-          model.schema[field].out === false ||
-          (onlyFields.length && !onlyFields.includes(field))
-        )
-          return;
+      if (
+        model.schema[field].out === false ||
+        (onlyFields.length && !onlyFields.includes(field))
+      )
+        return;
 
-        switch (model.schema[field].type) {
-          case "uuid":
-          case "guid":
-            fields.push(`BIN_TO_UUID(${model.table}.${field}) as ${field}`);
-            break;
-          default:
-            fields.push(`${model.table}.${field}`);
-        }
-      });
+      switch (model.schema[field].type) {
+        case "uuid":
+        case "guid":
+          fields.push(`BIN_TO_UUID(${model.table}.${field}) as ${field}`);
+          break;
+        default:
+          fields.push(`${model.table}.${field}`);
+      }
+    });
 
   return fields;
 };
 
 const modelSqlWhere = function (
   model,
-  vals,
+  ids,
   middlewareParams,
   callsWhere = []
 ) {
   const q = quote;
   const keys = parseArray(model.indexes?.keys || "");
+  const placeholders = [];
 
   let SQL = "";
   let gWhere = model.globalWhere ? q(model.globalWhere, "()") : "";
 
+  ids = typeof ids === "object" ? ids : [ids];
+
   gWhere =
     gWhere && middlewareParams ? stringBind(gWhere, middlewareParams) : "";
 
-  if (typeof vals !== "object") vals = [vals];
-
-  vals.map((val, i) =>
-    keys.map((k) => {
-      switch (
-        model.schema[k].type //TODO encapsule
-      ) {
+  ids.forEach((id, i) => {
+    keys.forEach((key) => {
+      switch (model.schema[key].type) {
         case "guid":
         case "uuid":
-          vals[i] = `UUID_TO_BIN('${val}')`;
+          ids[i] = Buffer.from(id.replace(/-/g, ''), 'hex');
           break;
         default:
-          vals[i] = `'${val}'`;
+          ids[i] = `'${id}'`;
       }
-    })
-  );
+    });
 
-  switch (vals.length) {
+    placeholders.push("?");
+  });
+
+  switch (ids.length) {
     case 0:
       SQL += gWhere ? ` WHERE ${gWhere}` : "";
       break;
     case 1:
-      SQL += ` WHERE ${model.table}.${keys[0]} = ${vals[0]} ${
-        gWhere ? "AND " + gWhere : ""
-      }`;
+      SQL += ` WHERE ${model.table}.${keys[0]} = ? ${gWhere ? "AND " + gWhere : ""}`;
       break;
     default:
-      SQL +=
-        typeof vals == "object"
-          ? ` WHERE ${model.table}.${keys[0]} IN('${vals.join("','")}') ${
-              gWhere ? "AND " + gWhere : ""
-            }`
-          : ` WHERE ${model.table}.${keys[0]} IN(${vals}) ${
-              gWhere ? "AND " + gWhere : ""
-            }`;
+      SQL += ` WHERE ${model.table}.${keys[0]} IN(${placeholders.join(",")}) ${gWhere ? "AND " + gWhere : ""}`;
   }
 
   if (callsWhere.length) SQL += `WHERE ${callsWhere.join(" AND ")}`;
 
-  return SQL;
+  console.log({ ids });
+
+  return { SQL, binds: ids };
 };
 
 module.exports = {
@@ -194,7 +188,7 @@ module.exports = {
     SQL.push(`SELECT ${fields.join(", ")} `);
     SQL.push(`FROM ${quote(model.table)} `);
     SQL.push(joins);
-    SQL.push(where);
+    SQL.push(where.SQL);
     SQL.push(order);
     SQL.push(limit);
 
@@ -279,8 +273,8 @@ module.exports = {
     let SQL =
       statement === "INSERT"
         ? `INSERT INTO ${model.table} (${fields.join(
-            ","
-          )}) VALUES (${insertValues.join("),(")})`
+          ","
+        )}) VALUES (${insertValues.join("),(")})`
         : `UPDATE ${model.table} SET ${values.join(",")}`;
 
     return { result, SQL, binds };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bee.js/node",
-  "version": "0.0.93",
+  "version": "0.0.94",
   "description": "A JavaScript framework for making Node.js API´s",
   "main": "index.js",
   "scripts": {
@@ -40,4 +40,4 @@
     "uuid": "^9.0.0",
     "ws": "^8.18.1"
   }
-}
+}