spice-js 2.6.11 → 2.6.13

package/build/models/SpiceModel.js

@@ -840,18 +840,39 @@ class SpiceModel {
 
           columnList.push("_permissions"); // Always include _permissions
 
+          columnList.push("id"); // Always include _permissions
+
           return _.map(data, entry => _.pick(entry, columnList));
         }
 
         return data;
       }
 
+      function prepColumns(columns) {
+        if (columns && columns != "") {
+          var columnList = columns.split(","); // Convert comma-separated string to array
+
+          return _.join(_.compact(_.map(columnList, column => {
+            if (column == "meta().id") {
+              column = undefined;
+            } else if (!column.startsWith("`") && !column.endsWith("`")) {
+              return "`" + column + "`";
+            }
+
+            return column;
+          })), ",");
+        }
+
+        return columns;
+      }
+
       try {
         if (!args) {
           args = {};
         }
 
         var query = "";
+        args.columns = prepColumns(args.columns);
 
         if (args.is_full_text && args.is_full_text === "true" || args.is_custom_query && args.is_custom_query === "true") {
           query = args.query;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.6.11",
+  "version": "2.6.13",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -744,17 +744,38 @@ export default class SpiceModel {
         columns = columns.replace(/meta\(\)\.id/g, "id");
         let columnList = columns.split(","); // Convert comma-separated string to array
         columnList.push("_permissions"); // Always include _permissions
+        columnList.push("id"); // Always include _permissions
         return _.map(data, (entry) => _.pick(entry, columnList));
       }
       return data;
     }
+
+    function prepColumns(columns) {
+      if (columns && columns != "") {
+        let columnList = columns.split(","); // Convert comma-separated string to array
+        return _.join(
+          _.compact(
+            _.map(columnList, (column) => {
+              if (column == "meta().id") {
+                column = undefined;
+              } else if (!column.startsWith("`") && !column.endsWith("`")) {
+                return `\`${column}\``;
+              }
+              return column;
+            })
+          ),
+          ","
+        );
+      }
+      return columns;
+    }
     try {
       if (!args) {
         args = {};
       }
 
       let query = "";
-
+      args.columns = prepColumns(args.columns);
       if (
         (args.is_full_text && args.is_full_text === "true") ||
         (args.is_custom_query && args.is_custom_query === "true")