spice-couchbase 2.0.36 → 2.0.37

package/build/index.js

@@ -476,6 +476,7 @@ module.exports = class Database {
     var order_by = arguments.length > 5 ? arguments[5] : undefined;
     var do_count = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : "false";
     var query_scope = arguments.length > 7 ? arguments[7] : undefined;
+    var join = arguments.length > 8 ? arguments[8] : undefined;
     return _asyncToGenerator(function* () {
       var is_legacy = _this15.scope_name !== "_default" && _this15.collection_name !== "_default";
       var bucket = "`".concat(_this15.use_bucket_name ? _this15.bucket : _this15.collection_name, "`");
@@ -493,7 +494,7 @@ module.exports = class Database {
           columns = "".concat(columns).concat(fix);
         }
 
-        var front_query = "SELECT ".concat(columns, " FROM ").concat(bucket);
+        var front_query = "SELECT ".concat(columns, " FROM ").concat(bucket, " ").concat(join);
         var conditions = [];
 
         if (_this15.use_bucket_name) {
@@ -506,7 +507,8 @@ module.exports = class Database {
 
         var where_clause = conditions.length ? " WHERE " : "";
         query = front_query + where_clause + conditions.join(" AND ");
-        var count_query = "SELECT count(meta().id) as count FROM ".concat(bucket).concat(where_clause);
+        var count_query = "SELECT count(meta(".concat(bucket, ").id) as count FROM ").concat(bucket, " ").concat(join, " ").concat(where_clause); //console.log("Cound Query::", count_query);
+
         var order_by_clause = order_by ? " ORDER BY ".concat(order_by) : "";
         var limit_clause = limit > 0 ? " LIMIT ".concat(limit) : "";
         var offset_clause = offset > 0 ? " OFFSET ".concat(offset) : "";

package/package.json

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

package/src/index.js

@@ -417,7 +417,8 @@ module.exports = class Database {
     offset = 0,
     order_by,
     do_count = "false",
-    query_scope
+    query_scope,
+    join
   ) {
     const is_legacy =
       this.scope_name !== "_default" && this.collection_name !== "_default";
@@ -439,7 +440,7 @@ module.exports = class Database {
       } else if (!containsIdWithSpace(columns)) {
         columns = `${columns}${fix}`;
       }
-      const front_query = `SELECT ${columns} FROM ${bucket}`;
+      const front_query = `SELECT ${columns} FROM ${bucket} ${join}`;
       const conditions = [];
 
       if (this.use_bucket_name) {
@@ -452,7 +453,8 @@ module.exports = class Database {
       const where_clause = conditions.length ? " WHERE " : "";
       query = front_query + where_clause + conditions.join(" AND ");
 
-      const count_query = `SELECT count(meta().id) as count FROM ${bucket}${where_clause}`;
+      const count_query = `SELECT count(meta(${bucket}).id) as count FROM ${bucket} ${join} ${where_clause}`;
+      //console.log("Cound Query::", count_query);
       const order_by_clause = order_by ? ` ORDER BY ${order_by}` : "";
       const limit_clause = limit > 0 ? ` LIMIT ${limit}` : "";
       const offset_clause = offset > 0 ? ` OFFSET ${offset}` : "";