bee-backend - npm Package Compare versions

Comparing version 0.0.4 to 0.0.5

beehive.js

@@ -7,3 +7,2 @@ const status   = require('./lib/beehive/status')
 const router   = require('./lib/beehive/router')
-const routes   = require('./lib/beehive/routes')
 const beeORM   = require('./lib/ORM/beeORM')
@@ -124,3 +123,2 @@ const beeDBA   = require('./lib/DBA/beeDBA')
         router,
-        routes,
         route,
@@ -127,0 +125,0 @@ freeRoute,

lib/ORM/beeORM.js

@@ -61,17 +61,31 @@ const mysql     = require('mysql2/promise'); //https://evertpot.com/executing-a-mysql-query-in-nodejs/
     let SQL    = ''
+    let gWhere = model.globalWhere ? q(model.globalWhere, '()') : ''
     let keys   = parseArray(model.indexes.keys)
-    let gWhere = model.globalWhere ? q(model.globalWhere, '()') : ''
 
-    console.log(gWhere)
+    gWhere = gWhere 
+             ? stringBind(gWhere, middlewareParams) 
+             : ''
 
-    gWhere = (gWhere) ? stringBind(gWhere, middlewareParams) : ''
+    if(typeof(vals) == 'string')
+        keys.map((a)=> {
+            switch(model.schema[a].type){ //TODO encapsule
+                case "guid":
+                case "uuid":
+                    vals = `UUID_TO_BIN('${vals}')`
+                break
+                default:
+                    vals = `'${vals}'`
+            }
+        })
 
-    switch(vals.length){
-        case 0 : SQL += (gWhere) ? ` WHERE ${gWhere}` : ''
+    switch(vals.length) {
+        case 0 : SQL += gWhere 
+                        ? ` WHERE ${gWhere}`
+                        : ''
         break
         case 1 : SQL += ` WHERE ${model.table}.${keys[0]} = '${vals[0]}' ${gWhere ? 'AND ' + gWhere : ''}`
         break
-        default: SQL += (typeof(vals) == 'object')
+        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 : ''}`
+                        : ` WHERE ${model.table}.${keys[0]} IN(${vals}) ${gWhere ? 'AND ' + gWhere : ''}`
     }
@@ -78,0 +92,0 @@

package.json

 {
   "name": "bee-backend",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A JavaScript framework for making Node.js API´s",
@@ -5,0 +5,0 @@ "main": "beehive.js",

No alert changes

Improved metrics

Total package byte prevSize

29926

increased by1.12%

Lines of code

669

increased by1.83%

No dependency changes