fib-app - npm Package Compare versions

Comparing version 1.9.1 to 1.9.2

lib/app.js

 const mq = require('mq');
 const classes = require('./classes');
-const Db = require('./db');
+const setupDb = require('./db');
 const diagram = require('./utils/diagram');
@@ -10,3 +10,3 @@
 
-        this.db = Db(this, url, opts);
+        this.db = setupDb(this, url, opts);
         classes.bind(this);
@@ -13,0 +13,0 @@ this.diagram = diagram;

lib/classes/index.js

@@ -61,3 +61,4 @@ const mq = require('mq');
                 session: req.session,
-                query: req.query.toJSON()
+                query: req.query.toJSON(),
+                request: req
             };
@@ -110,4 +111,4 @@
     app.post('/:classname/:func', (req, classname, func) => {
-        _(req, classname, (req, db, cls, data) => {
-            if (!check_acl(req.session, func, cls.ACL))
+        _(req, classname, (_req, db, cls, data) => {
+            if (!check_acl(_req.session, func, cls.ACL))
                 return err_info(4030001, {}, cls.cid);
@@ -123,3 +124,3 @@
             try {
-                return f(req, data);
+                return f(_req, data);
             } catch (e) {
@@ -126,0 +127,0 @@ console.error(e.stack);

lib/db.js

@@ -23,3 +23,3 @@ const Pool = require('fib-pool');
 
-            db.define = function (name, properties, opts) {
+            db.define = function (name, properties, orm_define_opts) {
                 var old_properties = properties;
@@ -50,3 +50,3 @@
 
-                var m = _define.call(this, name, properties, opts);
+                var m = _define.call(this, name, properties, orm_define_opts);
                 m.cid = cls_id++;
@@ -61,11 +61,11 @@
 
-                if (opts !== undefined) {
-                    if (opts.hooks !== undefined) {
-                        _beforeCreate = opts.hooks.beforeCreate;
-                        _beforeSave = opts.hooks.beforeSave;
+                if (orm_define_opts !== undefined) {
+                    if (orm_define_opts.hooks !== undefined) {
+                        _beforeCreate = orm_define_opts.hooks.beforeCreate;
+                        _beforeSave = orm_define_opts.hooks.beforeSave;
                     }
 
-                    m.functions = opts.functions;
-                    m.ACL = opts.ACL;
-                    m.OACL = opts.OACL;
+                    m.functions = orm_define_opts.functions;
+                    m.ACL = orm_define_opts.ACL;
+                    m.OACL = orm_define_opts.OACL;
                 }
@@ -118,3 +118,3 @@
                 var _hasOne = m.hasOne;
-                m.hasOne = function (name, model, opts) {
+                m.hasOne = function (name, model, orm_hasOne_opts) {
                     m.extends[name] = {
@@ -125,3 +125,3 @@ type: 'hasOne',
 
-                    if (opts !== undefined && opts.reversed)
+                    if (orm_hasOne_opts !== undefined && orm_hasOne_opts.reversed)
                         m.extends[name].reversed = true;
@@ -128,0 +128,0 @@

lib/utils/diagram.js

@@ -0,4 +1,4 @@
+var Viz = require('viz.js');
+
 module.exports = function () {
-    var Viz = require('viz.js');
-
     var models = [];
@@ -5,0 +5,0 @@ var exts = [];

package.json

 {
   "name": "fib-app",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "",
@@ -21,4 +21,4 @@ "main": "lib/app",
     "fib-session": "^0.1.1",
-    "viz.js": "^1.8.0"
+    "viz.js": "1.8.0"
   }
 }

todo.md

 * 重写用例，用例独立运行, uuid
+  - 修正 uuid 模式下, 关联模型用 id 关联时, 关联字段在 mysql 中分配长度过小的问题.
 
@@ -3,0 +4,0 @@ * reverse 测试

No alert changes

Improved metrics

Total package byte prevSize

58267

increased by0.48%

Lines of code

1211

increased by0.08%

No dependency changes