dborm-mysql 2.0.2 → 2.1.0

package/base/dbORM.js

@@ -158,23 +158,30 @@ let dbFunss = (config) => {
             listSql = initSessionSql + ';' + listSql;
             countSql = initSessionSql + ';' + countSql;
         }
-        let list, count;
+        let querys = []
         if(returnFields.includes('list')){
-            list = await db.query(listSql, listParams, connection).then(res => {
+            let list = db.query(listSql, listParams, connection).then(res => {
                 if(initSessionSql){
                     res = res[1];
                 }
                 return dbUtil.convert2RamFieldName(tableName, res);
             });
+            querys.push(list);
+        } else {
+            querys.push(Promise.resolve(null));
         }
         if(returnFields.includes('count')){
-            count = await db.query(countSql, countParams, connection).then(res => {
+            let count = db.query(countSql, countParams, connection).then(res => {
                 if(initSessionSql){
                     res = res[1];
                 }
                 return res[0].count;
             });
+            querys.push(count);
+        } else {
+            querys.push(Promise.resolve(null));
         }
+        let [list,count] = await Promise.all(querys);
         return {list, count};
     };
 

package/base/dbUtil.js

@@ -198,7 +198,7 @@ module.exports = (config, {dbCode = 733, ignoreDataError = false}) => {
             addFieldNames.push('modify_time');
         }
 
-        let sql = `INSERT INTO ${tableName} (${addFieldNames.map(field => '`' + field + '`').join(',')}) VALUES(?)`;
+        let sql = `INSERT INTO ${tableName} (${addFieldNames.join(',')}) VALUES(?)`;
         let params = addFieldNames.map(fieldName => obj[fieldName]);
         return {
             params: [params],

package/index.d.ts

@@ -144,9 +144,9 @@ declare namespace dbORM {
             add(data: any, connection?: mysql.Connection): Promise<number>,
             delete(data: any, connection?: mysql.Connection): Promise<any>,
             updateByIds(data: any, ids?: Array<number>, connection?: mysql.Connection): Promise<any>,
-            update(data: any, id: number | string, connection?: mysql.Connection): Promise<any>,
+            update(data: any, id: number, connection?: mysql.Connection): Promise<any>,
             updateByQuery(data: any, query: any, connection?: mysql.Connection): Promise<any>,
-            get(id: number | string, connection?: mysql.Connection): Promise<any>,
+            get(id: number, connection?: mysql.Connection): Promise<any>,
             createBulk(objs?: Array<any>, connection?: mysql.Connection): Promise<any>,
             updateBulk(objs?: Array<any>, connection?: mysql.Connection): Promise<any>,
             deleteByIds(ids?: Array<number>, connection?: mysql.Connection): Promise<any>,

package/package.json

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