dborm-mysql 2.1.4 → 2.2.1

package/.history/test_20230807153423.js

@@ -0,0 +1,536 @@
+/**
+ * Created by zhangdianpeng on 2017/8/8.
+ */
+
+const co = require('co');
+
+let db2ramFieldMap = require('./config/db2ramFieldMap.json');
+let textDbFieldsMap = require('./config/textDbFields.json');
+let dbConfig = {
+    "connectionLimit": 10,
+    "database": "test",
+    "host": "127.0.0.1",
+    "user": "*****",
+    "port": 3360,
+    "password": "******",
+    "multipleStatements": true
+};
+
+let dbORM = require('./index')({
+    log: true,
+    dbConfig,
+    db2ramFieldMap,
+    textDbFieldsMap,
+    options: {
+        dbCode: 734,
+        noConvertDbCodes: [735]
+    }
+});
+
+// process.MYSQL_READ_ONLY = true;
+
+const TableName = 'sample';
+let sampleDao = dbORM(TableName);
+let {dbUtil, db} = sampleDao;
+
+
+//istanbul cover node_modules/mocha/bin/_mocha src/app/server/test/dao
+let should = require('chai').should();
+let expect = require('chai').expect;
+
+let id0, id1;
+
+let sample = {
+    projectId: 1,
+    name: 'sampleTest',
+    json: {
+        a: 1,
+        b: 2
+    }
+};
+
+let wrapAdd = co.wrap(function*(){
+    let dbWrapFun = function(sample, conn) {
+        return sampleDao.add(sample, conn).then(insertId => {throw {insertId, code: 736}});
+    };
+
+    for(let i = 0; i < 10; i++){
+        let newSample = {
+            projectId: 1,
+            name: i
+        };
+        try{
+            yield db.wrapTransaction(dbWrapFun, 1)(newSample);
+        }catch(err){
+            console.log('err:', err);
+        }
+    }
+    return 'ok';
+});
+
+describe('sampleDao', function(){
+
+
+    //add接口
+    describe('db.wrapTranscation', function(){
+        it('事务处理', function (){
+            return wrapAdd().then(res => {
+                res.should.to.be.a('string');
+            });
+        });
+    });
+
+    //add接口
+    describe('add', function(){
+        it('插入单条数据，返回插入的id', function (){
+            return sampleDao.add(sample).then(insertId => {
+                insertId.should.to.be.a('number');
+                insertId.should.to.be.least(0);
+                id0 = insertId;
+                console.log('id0:', id0);
+            })
+        });
+        it('插入数据为空，抛出500异常', function (){
+            return sampleDao.add({}).catch(err => {
+                console.log('500.empty.message:', err);
+                err.code.should.to.equal(734);
+            })
+        });
+        it('插入带id的数据', function (){
+            return sampleDao.add({id: 1, projectId: 2}).then(insertId => {
+                insertId.should.to.be.a('number');
+                insertId.should.to.be.least(0);
+            })
+        });
+    });
+
+    //createBulk接口
+    describe('createBulk 批量插入数据，返回的插入id只有一个', function(){
+        it('return a object', function (){
+            return sampleDao.createBulk([sample, sample]).then(res => {
+                id1 = res.insertId;
+                console.log('id1:', id1);
+                res.should.to.be.a('object');
+            })
+        });
+        it('有某些数据为空时，抛出异常500', function (){
+            return sampleDao.createBulk([{}, sample, {}]).catch(err => {
+                console.log('message:', err.message);
+                err.code.should.to.equal(734);
+            })
+        });
+    });
+
+    //get接口
+    describe('get', function(){
+        it('如果指定id不存在，返回undefined', function (){
+            return sampleDao.get(100000).then(res => {
+                expect(res).to.be.an('undefined');
+            })
+        });
+        it('返回指定id的sample', function (){
+            return sampleDao.get(id0).then(res => {
+                res.should.to.be.an('object');
+            })
+        });
+    });
+
+    //pageQuery接口
+    describe('pageQuery', function(){
+        it('分页查询返回 count and list', function (){
+            return sampleDao.pageQuery({
+                initSql: 'select project_id as projectId, name from sample where id = ?',
+                initParams: [1],
+                offset: 0,
+                limit: 20,
+                sort: ['name:2'],
+                keyword: {
+                    name: 'xx'
+                },
+                initSessionSql: 'select 1'
+            }).then(res => {
+                expect(res.count).to.be.a('number');
+                expect(res.list).to.be.an('array');
+            })
+        });
+
+        it('分页查询返回 only count', function (){
+            return sampleDao.pageQuery({
+                initSql: 'select project_id as projectId, name from sample where id = ?',
+                initParams: [1],
+                offset: 0,
+                limit: 20,
+                sort: ['name:2'],
+                returnFields: ['count'],
+                keyword: {
+                    name: 'xx'
+                }
+            }).then(res => {
+                expect(res.count).to.be.a('number');
+                expect(res.list).to.be.an('null');
+            })
+        });
+
+        it('分页查询返回 only list', function (){
+            return sampleDao.pageQuery({
+                initSql: 'select project_id as projectId, name from sample where id = ?',
+                initParams: [1],
+                offset: 0,
+                limit: 20,
+                sort: ['name:2'],
+                returnFields: ['list'],
+                keyword: {
+                    name: 'xx'
+                }
+            }).then(res => {
+                expect(res.count).to.be.an('null');
+                expect(res.list).to.be.an('array');
+            })
+        });
+    });
+
+    //getList接口
+    describe('getList', function(){
+        let query = {
+            selectFields: 'projectId',
+            projectId: 1,
+            keyword: {
+                name: 's\amp_l%e'
+            },
+            initSessionSql: 'select 1'
+        };
+        it('return dashboards', function (){
+            return sampleDao.getList(Object.assign({}, {inFields: {
+                id: [id0, id1]
+            }})).then(res =>{
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+        let queryWithSortAsc = Object.assign({}, query, {
+            inFields: {
+               id: [],
+            },
+            sort: "name:1"
+        });
+        it('按照指定字段升序', function (){
+            return sampleDao.getList(queryWithSortAsc).then(res =>{
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+        let queryWithSortDec = Object.assign({}, query, {
+            sort: "name:2"
+        });
+        it('按照指定字段降序', function (){
+            return sampleDao.getList(queryWithSortDec).then(res =>{
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+
+        let queryWithSortArray = Object.assign({}, query, {
+            sort: ["name:2", "id:1", "projectId:2"]
+        });
+        it('queryWithSortArrayTest', function (){
+            return sampleDao.getList(queryWithSortArray).then(res =>{
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+
+        let queryWithPage = Object.assign({}, query, {
+            sort: "name:2",
+            offset: 1,
+            limit: 20
+        });
+        it('分页测试', function (){
+            return sampleDao.getList(queryWithPage).then(res =>{
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+
+        let queryWithCustomQuery = Object.assign({}, query, {
+            customQuery: 'id & 1 = 1'
+        });
+
+        it('customQueryTest', function (){
+            return sampleDao.getList(queryWithCustomQuery).then(res =>{
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+        
+        let queryWithCustomQueryOnly = Object.assign({}, {
+            customQuery: 'id & 1 = 1'
+        });
+
+        it('customQueryTestOnly', function (){
+            return sampleDao.getList(queryWithCustomQueryOnly).then(res => {
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+
+        let selectFieldsWithAs = Object.assign({}, {
+            selectFields: ['name as myName'],
+        });
+
+        it('selectFieldsWithAsTest', function (){
+            return sampleDao.getList(selectFieldsWithAs).then(res => {
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+
+        let selectFieldsWithAsAndSort = Object.assign({}, {
+            selectFields: ['name as myName'],
+            sort: 'myName:1'
+        });
+
+        it('selectFieldsWithAsAndSortTest', function (){
+            return sampleDao.getList(selectFieldsWithAsAndSort).then(res => {
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+
+        let selectFieldsWithAsAndKeywordAndSort = Object.assign({}, {
+            selectFields: ['*', 'name as myName'],
+            sort: 'myName:1',
+            keyword: 'myName:hello'
+        });
+
+        it('selectFieldsWithAsAndSortTest', function (){
+            return sampleDao.getList(selectFieldsWithAsAndKeywordAndSort).then(res => {
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+
+        let selectFieldsWithAsAndKeywordAndSortAndInfieldsAndQuery = Object.assign({}, {
+            selectFields: ['*', 'SUBSTRING(name, INSTR(name,",") +1, +2) AS myName'],
+            sort: 'myName:1',
+            keyword: 'myName:hello',
+            inFields: {
+                myName: ['a', 'b']
+            },
+            customQuery: 'id & 1 = 1',
+            myName: 'c'
+        });
+
+        it('selectFieldsWithAsAndKeywordAndSortAndInfieldsAndQueryTest', function (){
+            return sampleDao.getList(selectFieldsWithAsAndKeywordAndSortAndInfieldsAndQuery).then(res => {
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+    });
+
+    //findOne接口
+    describe('findOne', function(){
+        let query = {
+            selectFields: 'projectId',
+            projectId: 1,
+            offset: -1,
+            limit: 20
+        };
+        it('return One dashboard', function (){
+            return sampleDao.findOne(query).then(res =>{
+                res.should.to.be.an('object');
+            })
+        });
+    });
+
+    //getListByIds接口
+    describe('getListByIds', function(){
+        it('return dashboards', function (){
+            return sampleDao.getListByIds([id0, id1]).then(res =>{
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+        it('如果ids为空的情况', function (){
+            return sampleDao.getListByIds().then(res =>{
+                res.should.to.be.instanceOf(Array);
+            })
+        });
+    });
+
+    describe('getCount', function(){
+        let query = {
+            projectId: 1,
+            keyword: {
+                name: 'sample'
+            }
+        };
+        it('return count', function(){
+            return sampleDao.getCount(Object.assign({}, {inFields: {
+                id: [id0, id1]
+            }})).then(res => {
+                res.should.to.be.a('number');
+                res.should.to.be.least(0);
+            })
+        });
+        it('return all count if query is {}', function(){
+            return sampleDao.getCount({}).then(res => {
+                res.should.to.be.a('number');
+                res.should.to.be.least(0);
+            })
+        });
+    });
+
+    //update接口
+    describe('update', function(){
+        it('更新数据', function (){
+            let sample = {
+                projectId: 2,
+                json: {
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }
+            };
+            return sampleDao.update(sample, id0).then(res =>{
+                res.should.to.be.equal('ok');
+            })
+        });
+        it('update with nullFields', function (){
+            let sample = {
+                projectId: 2,
+                nullFields: ['name', 'creatorId'],
+                name: null,
+                creatorId: undefined,
+                json: {
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }
+            };
+            return sampleDao.update(sample, id0).then(res =>{
+                res.should.to.be.equal('ok');
+            })
+        });
+        it('update with noUpdateTime', function (){
+            let sample = {
+                projectId: 2,
+                nullFields: ['name', 'creatorId'],
+                name: null,
+                noUpdateTime: true,
+                creatorId: undefined,
+                json: {
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }
+            };
+            return sampleDao.update(sample, id0).then(res =>{
+                res.should.to.be.equal('ok');
+            })
+        });
+    });
+
+    //updateByIds接口
+    describe('updateByIds', function(){
+        it('更新数据', function (){
+            let sample = {
+                projectId: 2,
+                json: {
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }
+            };
+            return sampleDao.updateByIds(sample, [id0, id1]).then(res =>{
+                res.should.to.be.equal('ok');
+            })
+        });
+    });
+
+    //updateByIds接口
+    describe('updateByQuery', function(){
+        it('更新数据', function (){
+            let sample = {
+                projectId: 2,
+                json: {
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }
+            };
+            return sampleDao.updateByQuery(sample, {projectId: 2, inFields: {id: [id0, id1]}}).then(res =>{
+                res.should.to.be.equal('ok');
+            })
+        });
+        it('不能无条件更新数据', function (){
+            let sample = {
+                projectId: 2,
+                json: {
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }
+            };
+            return sampleDao.updateByQuery(sample, {}).catch(err => {
+                console.log('message:', err.message);
+                err.message.should.to.equal('updateByQuery不能无条件update');
+            })
+        });
+    });
+
+
+    describe('updateBulk',function(){
+        it('使用updateBulk更新数据', function (){
+            let sample = {
+                projectId: 2,
+                id:id0,
+                json: {
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }
+            };
+            let sample1 = {
+                projectId: 2,
+                id:id1,
+                json: {
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }
+            };
+            return sampleDao.updateBulk([sample,sample1]).then(res =>{
+                res.should.to.be.equal('ok');
+            })
+        });
+        it('使用updateBulk更新空数据', function (){
+            return sampleDao.updateBulk([]).then(res =>{
+                res.should.to.be.equal('ok');
+            })
+        });
+    });
+
+
+    //delete接口
+    describe('delete', function(){
+        it('删除数据', function (){
+            return sampleDao.delete({inFields: {id: [id0]}}).then(res =>{
+                res.should.to.be.instanceOf(Object);
+            })
+        });
+        it('不能无条件的删除所有内容', function (){
+            return sampleDao.delete().catch(err =>{
+                err.code.should.to.equal(734);
+            })
+        });
+    });
+    //deleteByIds接口
+    describe('deleteByIds', function(){
+        it('根据id列表删除数据', function (){
+            return sampleDao.deleteByIds([id0, id1]).then(res =>{
+                res.should.to.be.instanceOf(Object);
+            })
+        });
+        it('如果ids为空，则返回undefined', function (){
+            return sampleDao.deleteByIds([]).then(res =>{
+                expect(res).to.be.an('undefined');
+            })
+        });
+    });
+
+});
+
+
+
+
+
+// userDao.get('id');

package/base/db.js

@@ -23,6 +23,12 @@ let logSql = (connection, rows, sql, startTime, logExecuteTime) => {
     console.log(info);
 };
 
+// 去掉报错信息行，只保留当前函数调用栈
+let getCurrentStack = (currentStack) => {
+    // new Error().stack的格式是：Error: 错误信息\n    at 函数名 (文件路径:行号:列号)... 去掉第一行即可获取当前函数的调用栈
+    return currentStack.split('\n').slice(1).join('\n');
+};
+
 module.exports = (dbConfig, {log, noConvertDbCodes, dbCode, logExecuteTime}) => {
     let db = {
         pool: null
@@ -90,6 +96,7 @@ module.exports = (dbConfig, {log, noConvertDbCodes, dbCode, logExecuteTime}) =>
     };
 
     db.query = function (sql, sqlParam, connection) {
+        let currentStack = new Error().stack;
         let query;
         return new Promise(function (resolve, reject) {
             if(process.MYSQL_READ_ONLY  && !sql.toLowerCase().trimLeft().startsWith('select')){
@@ -111,6 +118,7 @@ module.exports = (dbConfig, {log, noConvertDbCodes, dbCode, logExecuteTime}) =>
                             logSql(connection, rows, query.sql, startTime, logExecuteTime);
                         }
                         err.code = dbCode;
+                        err.stack = err.stack + getCurrentStack(currentStack);
                         reject(err);
                     } else {
                         resolve(rows);
@@ -135,6 +143,7 @@ module.exports = (dbConfig, {log, noConvertDbCodes, dbCode, logExecuteTime}) =>
                         }
                     });
                 }).catch(function (err) {
+                    err.stack = err.stack + getCurrentStack(currentStack);
                     reject(err);
                 });
             }

package/base/dbUtil.js

@@ -34,7 +34,7 @@ module.exports = (config, {dbCode = 733, ignoreDataError = false}) => {
         if(typeof keywordRes == 'string'){
             let [field, ...keyword] = keywordRes.split(':');
             keyword = keyword.join(':');
-            orSqls.push(tableName + '.' + field + ' like ?');
+            orSqls.push(tableName + '.`' + field + '` like ?');
             if (keyword) {
                 keyword = dbUtil.parseKeyword(keyword);
             }
@@ -43,7 +43,7 @@ module.exports = (config, {dbCode = 733, ignoreDataError = false}) => {
             Object.keys(keywordRes).map(field => {
                 let subKeyword = keywordRes[field];
                 if (subKeyword) {
-                    orSqls.push(tableName + '.' + field + ' like ?');
+                    orSqls.push(tableName + '.`' + field + '` like ?');
                     subKeyword = dbUtil.parseKeyword(subKeyword);
                     params.push('%' + subKeyword + '%');
                 }
@@ -59,7 +59,7 @@ module.exports = (config, {dbCode = 733, ignoreDataError = false}) => {
         if(insertFieldNameMap[field]){
             return '(' + insertFieldNameMap[field] + ')';
         }else{
-            return tableName + '.' + field;
+            return tableName + '.' + '`' + field + '`';
         }
     };
 
@@ -191,11 +191,16 @@ module.exports = (config, {dbCode = 733, ignoreDataError = false}) => {
 
         if (!obj.create_time && fieldNames.includes('create_time')){
             obj.create_time = new Date();
-            addFieldNames.push('create_time');
+            if (!addFieldNames.includes('create_time')) {
+                addFieldNames.push('create_time');
+            }
         }
+
         if (!obj.modify_time && fieldNames.includes('modify_time')){
             obj.modify_time = new Date();
-            addFieldNames.push('modify_time');
+            if (!addFieldNames.includes('modify_time')) {
+                addFieldNames.push('modify_time');
+            }
         }
 
         let sql = `INSERT INTO ${tableName} (${addFieldNames.map(field => '`' + field + '`').join(',')}) VALUES(?)`;
@@ -235,7 +240,7 @@ module.exports = (config, {dbCode = 733, ignoreDataError = false}) => {
         });
 
 
-        let sql = 'INSERT INTO ' + tableName + '(' + addFieldNames.join(',') + ')' + ' VALUES ?';
+        let sql = 'INSERT INTO ' + tableName + '(' + addFieldNames.map(field => '`' + field + '`').join(',') + ')' + ' VALUES ?';
         let params = objs.map(obj => addFieldNames.map(fieldName => obj[fieldName]));
         return {
             params: [params],
@@ -351,7 +356,7 @@ module.exports = (config, {dbCode = 733, ignoreDataError = false}) => {
                 let value = obj[fieldName];
                 if (nullFields.includes(fieldName) || !util.isNullOrUndefined(value)) {
                     params.push(value);
-                    updateArr.push(fieldName + '=?');
+                    updateArr.push('`' + fieldName + '`' + ' =?');
                 }
             });
         }
@@ -387,7 +392,7 @@ module.exports = (config, {dbCode = 733, ignoreDataError = false}) => {
                 obj.modify_time = new Date();
         });
         fieldNames = fieldNames.filter(fieldName => !util.isUndefined(objs[0][fieldName]));
-        let sql = 'INSERT INTO ' + tableName + '(' + fieldNames.join(',') + ')' + ' VALUES ?';
+        let sql = 'INSERT INTO ' + tableName + '(' + fieldNames.map(fieldName => '`' + fieldName + '`').join(',') + ')' + ' VALUES ?';
         let params = objs.map(obj => fieldNames.map(fieldName => obj[fieldName]));
         let updateField = [];
         fieldNames.forEach(function (field) {
@@ -436,7 +441,7 @@ module.exports = (config, {dbCode = 733, ignoreDataError = false}) => {
                 toSelectFields.push(field);
             }else {
                 if(field !== '*'){
-                    field = dbUtil.toDbFieldNames(tableName, [field])[0];
+                    field = '`' + dbUtil.toDbFieldNames(tableName, [field])[0] + '`';
                 }
                 toSelectFields.push(tableName + '.' + field);
             }

package/base/err.js

@@ -6,4 +6,5 @@ module.exports = function (message, code, value){
     this.message = message;
     this.code = code || 500;
     this.value = value || '';
+    Error.captureStackTrace(this);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dborm-mysql",
-  "version": "2.1.4",
+  "version": "2.2.1",
   "description": "a NodeJs ORM for mysql",
   "main": "index.js",
   "types": "index.d.ts",