spice-js 2.6.12 → 2.6.13

package/build/models/SpiceModel.js

@@ -840,6 +840,8 @@ class SpiceModel {
 
           columnList.push("_permissions"); // Always include _permissions
 
+          columnList.push("id"); // Always include _permissions
+
           return _.map(data, entry => _.pick(entry, columnList));
         }
 
@@ -850,7 +852,15 @@ class SpiceModel {
         if (columns && columns != "") {
           var columnList = columns.split(","); // Convert comma-separated string to array
 
-          return _.join(_.map(columnList, column => "`" + column + "`"), ",");
+          return _.join(_.compact(_.map(columnList, column => {
+            if (column == "meta().id") {
+              column = undefined;
+            } else if (!column.startsWith("`") && !column.endsWith("`")) {
+              return "`" + column + "`";
+            }
+
+            return column;
+          })), ",");
         }
 
         return columns;

package/package.json

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

package/src/models/SpiceModel.js

@@ -744,6 +744,7 @@ 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;
@@ -753,7 +754,16 @@ export default class SpiceModel {
       if (columns && columns != "") {
         let columnList = columns.split(","); // Convert comma-separated string to array
         return _.join(
-          _.map(columnList, (column) => `\`${column}\``),
+          _.compact(
+            _.map(columnList, (column) => {
+              if (column == "meta().id") {
+                column = undefined;
+              } else if (!column.startsWith("`") && !column.endsWith("`")) {
+                return `\`${column}\``;
+              }
+              return column;
+            })
+          ),
           ","
         );
       }