@bee.js/node 0.0.40 → 0.0.42

package/beehive.js

@@ -284,6 +284,13 @@ module.exports = function hive(req = {}, res = {}, model = null) {
             return this
         },
 
+        orderByIf: function(condition, ...fields) {
+            if (condition)
+                script[0]['orderBy'].push(fields.join(', '))
+
+            return this
+        },
+
         limit: function(...params) {
 
             script[0]['limit'].push(params.join(","))

package/lib/DBA/beeDBA.js

@@ -1,119 +1,131 @@
-const beeORM  = require('../ORM/beeORM')
-const beeHive = require('../../beehive')
+const beeORM = require("../ORM/beeORM");
+const beeHive = require("../../beehive");
 
 const fieldType = {
-    mysql : function(field) {
-        let type = field.type.split(' ')[0].trim()
-
-        switch (type) {
-            case 'integer': 
-            case 'int': 
-                type = 'int'
-            break
-            case 'decimal':
-                type = `decimal(${(field.length || 10.1).toString().replace('.',',')})`
-            break
-
-            case 'string':
-            case 'varchar': 
-                type = `varchar(${field.length || 45})`
-            break
-            case 'guid': 
-                type     = `binary(16)`
-                field.ai = false
-            break
-            case 'char': 
-                type = `char(${field.length || 5})`
-            break
-        }
-        return type 
-                + (!field.null   ? ' NOT NULL' : '') 
-                + (field.ai      ? ' AUTO_INCREMENT' : '')
-                + (field.default !== undefined ? ` DEFAULT ${field.default}` : '') 
-                + (field.default !== undefined && field.onUpdate ? ` ON UPDATE ${field.default}` : '')
+  mysql: function (field) {
+    let type = field.type.split(" ")[0].trim();
+
+    switch (type) {
+      case "integer":
+      case "int":
+        type = "int";
+        break;
+      case "decimal":
+        type = `decimal(${(field.length || 10.1)
+          .toString()
+          .replace(".", ",")})`;
+        break;
+
+      case "string":
+      case "varchar":
+        type = `varchar(${field.length || 45})`;
+        break;
+      case "guid":
+        type = `binary(16)`;
+        field.ai = false;
+        break;
+      case "char":
+        type = `char(${field.length || 5})`;
+        break;
+      case "file":
+        type = "blob";
+        break;
     }
-}
+    return (
+      type +
+      (!field.null ? " NOT NULL" : "") +
+      (field.ai ? " AUTO_INCREMENT" : "") +
+      (field.default !== undefined ? ` DEFAULT ${field.default}` : "") +
+      (field.default !== undefined && field.onUpdate
+        ? ` ON UPDATE ${field.default}`
+        : "")
+    );
+  },
+};
 
 module.exports.actions = {
-    mysql : {
-        MODEL_STATEMENT_EXECUTE : async function(req, res) {
-            let hive = beeHive()
-            let data = await hive.dbExec(req.body.statement_execute)
-            
-            res.status(200).send({data: data})
-        },
-
-        MODEL_CREATE_DB : function(req, res) {
-            let configsDB = global.configs.databases.default
-            let models    = global.models
-            let SQL       = ['','']
-
-            //TODO create db with user permissions
-            
-            Object
-            .keys(models)
-            .map((model)=> {
-                if(!req.body.models[model]._checked) return
-
-                SQL[0] += this.MODEL_CREATE_TABLE(models[model], configsDB)
-                SQL[1] += models[model].relations
-                            ? this.MODEL_CREATE_CONSTRAINT(models[model], configsDB)
-                            : ''
-            })
-    
-            res.status(200).send({data: SQL.join("")})
-        },
-    
-        MODEL_CREATE_TABLE : function(model, configsDB) {
-            let q   = beeORM.quote
-            let SQL = ''
-            
-            
-            SQL = `CREATE TABLE IF NOT EXISTS ${q(model.table)} (`
-            
-            for(let field in model.schema)
-                SQL += `\n        ${q(field)} ${fieldType[configsDB.drive](model.schema[field])},` // TODO criar funcao para relacionamentos.
-            
-            SQL = SQL.slice(0, SQL.length - 1)
-
-            if(model.indexes) {
-                if(model.indexes.keys)
-                    SQL += `,\n        PRIMARY KEY (${q(model.indexes.keys)})`
-            
-                //TODO fazer uniques e cia. colocar em funcao.
-            }
-
-            SQL += `\n) ENGINE=${configsDB.engine} DEFAULT CHARSET=${configsDB.charset};\n\n`
-    
-            return SQL
-        },
-    
-        MODEL_CREATE_CONSTRAINT : function(model, configsDB) {
-            let q   = beeORM.quote
-            let SQL = '\n\n\n\n'
-    
-            SQL += `----- Constraints for table ${q(model.table)} -----\n\n`
-            SQL += `ALTER TABLE ${q(model.table)}\n`
-            
-            for(let field in model.relations)
-                SQL += `    ADD CONSTRAINT ${q('FK_'+model.relations[field].split('.')[0])} 
-                        FOREIGN KEY ${q(field)} 
-                        REFERENCES ${model.relations[field].split('.')[0]}(${q('FK_'+model.relations[field].split('.')[0])}) 
-                        ON DELETE CASCATE ON UPDATE CASCATE;
-                       \n\n`
-            
-                //SQL += `-- COMMIT; \n\n`
-    
-            return SQL
-        }
+  mysql: {
+    MODEL_STATEMENT_EXECUTE: async function (req, res) {
+      let hive = beeHive();
+      let data = await hive.dbExec(req.body.statement_execute);
+
+      res.status(200).send({ data: data });
     },
 
-    mssql : {
-        // TODO next version
+    MODEL_CREATE_DB: function (req, res) {
+      let configsDB = global.configs.databases.default;
+      let models = global.models;
+      let SQL = ["", ""];
+
+      //TODO create db with user permissions
+
+      Object.keys(models).map((model) => {
+        if (!req.body.models[model]._checked) return;
+
+        SQL[0] += this.MODEL_CREATE_TABLE(models[model], configsDB);
+        SQL[1] += models[model].relations
+          ? this.MODEL_CREATE_CONSTRAINT(models[model], configsDB)
+          : "";
+      });
+
+      res.status(200).send({ data: SQL.join("") });
     },
 
-    mongoDB : {
-        // TODO next version
-    }
-    
-}
+    MODEL_CREATE_TABLE: function (model, configsDB) {
+      let q = beeORM.quote;
+      let SQL = "";
+
+      SQL = `CREATE TABLE IF NOT EXISTS ${q(model.table)} (`;
+
+      for (let field in model.schema)
+        SQL += `\n        ${q(field)} ${fieldType[configsDB.drive](
+          model.schema[field]
+        )},`; // TODO criar funcao para relacionamentos.
+
+      SQL = SQL.slice(0, SQL.length - 1);
+
+      if (model.indexes) {
+        if (model.indexes.keys)
+          SQL += `,\n        PRIMARY KEY (${q(model.indexes.keys)})`;
+
+        //TODO fazer uniques e cia. colocar em funcao.
+      }
+
+      SQL += `\n) ENGINE=${configsDB.engine} DEFAULT CHARSET=${configsDB.charset};\n\n`;
+
+      return SQL;
+    },
+
+    MODEL_CREATE_CONSTRAINT: function (model, configsDB) {
+      let q = beeORM.quote;
+      let SQL = "\n\n\n\n";
+
+      SQL += `/*----- Constraints for table ${q(model.table)} -----*/\n\n`;
+      SQL += `ALTER TABLE ${q(model.table)}\n`;
+
+      for (let field in model.relations)
+        SQL += `    ADD CONSTRAINT ${q(
+          `FK_${model.relations[field].split(".")[0]}_X_${model.table}_${field}`
+        )} 
+                        FOREIGN KEY (${field}) 
+                        REFERENCES ${
+                          model.relations[field].split(".")[0]
+                        } (${field}) 
+                        ${"ON DELETE CASCADE"} 
+                        ${"ON UPDATE CASCADE"};
+                       \n\n`;
+
+      //SQL += `-- COMMIT; \n\n`
+
+      return SQL;
+    },
+  },
+
+  mssql: {
+    // TODO next version
+  },
+
+  mongoDB: {
+    // TODO next version
+  },
+};

package/package.json

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