@less-is-more/less-js 1.2.14 → 1.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.2.14",
+  "version": "1.2.15",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {

package/src/db.js

@@ -102,7 +102,7 @@ module.exports = class Db {
         await this.add(model, nNewData);
       } else {
         let needUpdate = false;
-        if ( compareColumn.length > 0) {
+        if (compareColumn.length > 0) {
           const nOldData = oldData[nOldIndex];
           for (let nColumn of compareColumn) {
             if (nOldData[nColumn] !== nNewData[nColumn]) {
@@ -164,7 +164,7 @@ module.exports = class Db {
    * @param {*} attributes 只返回属性
    * @returns
    */
-   static async findAll(
+  static async findAll(
     model,
     params = {},
     order = [["id", "desc"]],
@@ -202,10 +202,16 @@ module.exports = class Db {
     }
   }
 
-  static async sql(sql, values = [], type = this.SQL_TYPE_SELECT) {
-    return await this.getInstance().query(sql, {
+  static async sql(sql, values = [], type = this.SQL_TYPE_SELECT, model) {
+    let params = {
       type: type,
       replacements: values,
-    });
+    };
+    if (model) {
+      params.model = model;
+      params.mapToModel = true;
+      params.type = Sequelize.QueryTypes.RAW;
+    }
+    return await this.getInstance().query(sql, params);
   }
 };

package/test/test-db.js

@@ -114,6 +114,15 @@ describe("db.js", () => {
       let data = await Db.sql("select * from menu where id=?", [1]);
       console.log(data);
     });
+    it("to model", async () => {
+      let data = await Db.sql(
+        "select * from menu",
+        [],
+        Db.SQL_TYPE_SELECT,
+        Menu
+      );
+      console.log(JSON.stringify(data));
+    });
     it("insert", async () => {
       let data = await Db.sql(
         "insert into menu (name) values(?)",
@@ -177,5 +186,5 @@ describe("db.js", () => {
       console.log(data);
       assert(data.length > 0, "no data");
     });
-  })
+  });
 });

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-  "editor.suggest.snippetsPreventQuickSuggestions": false
-}