spice-couchbase 2.0.23 → 2.0.26

package/build/index.js

@@ -446,6 +446,10 @@ module.exports = class Database {
       var is_legacy = _this15.scope_name !== "_default" && _this15.collection_name !== "_default";
       var bucket = "`".concat(_this15.use_bucket_name ? _this15.bucket : _this15.collection_name, "`");
 
+      function containsIdWithSpace(str) {
+        return /\b\.?id\b/i.test(str); // Updated regex to match "id" as a separate word or preceded by a dot (".id")
+      }
+
       try {
         var fix = ", META(".concat(bucket, ").id AS id");
 
@@ -457,7 +461,7 @@ module.exports = class Database {
           columns = "";
         }
 
-        var front_query = "SELECT ".concat(columns, " ").concat(fix, " FROM ").concat(bucket);
+        var front_query = "SELECT ".concat(columns, " ").concat(containsIdWithSpace(columns) ? "" : fix, " FROM ").concat(bucket);
         var conditions = [];
 
         if (_this15.use_bucket_name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-couchbase",
-  "version": "2.0.23",
+  "version": "2.0.26",
   "description": "",
   "main": "build/index.js",
   "scripts": {

package/src/index.js

@@ -416,6 +416,10 @@ module.exports = class Database {
       this.use_bucket_name ? this.bucket : this.collection_name
     }\``;
 
+    function containsIdWithSpace(str) {
+      return /\b\.?id\b/i.test(str); // Updated regex to match "id" as a separate word or preceded by a dot (".id")
+    }
+
     try {
       const fix = `, META(${bucket}).id AS id`;
 
@@ -427,7 +431,9 @@ module.exports = class Database {
         columns = "";
       }
 
-      const front_query = `SELECT ${columns} ${fix} FROM ${bucket}`;
+      const front_query = `SELECT ${columns} ${
+        containsIdWithSpace(columns) ? "" : fix
+      } FROM ${bucket}`;
       const conditions = [];
 
       if (this.use_bucket_name) {