spice-couchbase 2.0.27 → 2.0.29

package/build/index.js

@@ -456,7 +456,7 @@ module.exports = class Database {
         var fix = ", META(".concat(bucket, ").id AS id");
 
         if (columns === "*" || !columns) {
-          columns = "(".concat(bucket, ").*");
+          columns = "(".concat(bucket, ").* ").concat(fix);
         } else if (!containsIdWithSpace(columns)) {
           columns = "".concat(columns).concat(fix);
         }

package/package.json

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

package/src/index.js

@@ -426,7 +426,7 @@ module.exports = class Database {
       const fix = `, META(${bucket}).id AS id`;
 
       if (columns === "*" || !columns) {
-        columns = `(${bucket}).*`;
+        columns = `(${bucket}).* ${fix}`;
       } else if (!containsIdWithSpace(columns)) {
         columns = `${columns}${fix}`;
       }
@@ -531,12 +531,25 @@ module.exports = class Database {
     return response.rows;
   }
 
-  async query(query, query_scope = "cluster") {
+  /*  async query(query, query_scope = "cluster") {
     let scope = query_scope || this.query_scope;
     if (scope == "cluster") {
       return await this.cluster.query(query);
     } else {
       return await this.scope.query(query);
     }
+  } */
+
+  async query(query, query_scope = "cluster") {
+    let scope = query_scope || this.query_scope;
+
+    // Escape the query string
+    const sanitizedQuery = couchbase.N1qlQuery.fromString(query).toString();
+
+    if (scope === "cluster") {
+      return await this.cluster.query(sanitizedQuery);
+    } else {
+      return await this.scope.query(sanitizedQuery);
+    }
   }
 };