spice-couchbase 2.0.35 → 2.0.37

package/build/index.js

@@ -204,13 +204,6 @@ module.exports = class Database {
         function loadAllCollections() {
           return _loadAllCollections.apply(this, arguments);
         }
-        /* console.log("================================");
-        console.log(
-          "Collection Set",
-          spice?.db?.collections?.has(collection_name),
-          collection_name
-        ); */
-
 
         function _loadAllCollections() {
           _loadAllCollections = _asyncToGenerator(function* () {
@@ -237,14 +230,11 @@ module.exports = class Database {
         }
 
         if ((_spice2 = spice) === null || _spice2 === void 0 ? void 0 : (_spice2$db = _spice2.db) === null || _spice2$db === void 0 ? void 0 : (_spice2$db$collection = _spice2$db.collections) === null || _spice2$db$collection === void 0 ? void 0 : _spice2$db$collection.has(collection_name)) {
-          //console.log("Using Internal Collection Set", true);
           return true;
         } else {
           var _spice3, _spice3$db, _spice3$db$collection;
 
-          //console.log("Using Internal Collection Set", false);
-          spice.db.collections = yield loadAllCollections(); //console.log("Collection Set", spice.db.collections.entries());
-
+          spice.db.collections = yield loadAllCollections();
           return (_spice3 = spice) === null || _spice3 === void 0 ? void 0 : (_spice3$db = _spice3.db) === null || _spice3$db === void 0 ? void 0 : (_spice3$db$collection = _spice3$db.collections) === null || _spice3$db$collection === void 0 ? void 0 : _spice3$db$collection.has(collection_name);
         }
       } catch (e) {
@@ -333,7 +323,6 @@ module.exports = class Database {
         console.log(e.message, e, doc_id);
       }
 
-      console.log("Return from Insert", doc_id);
       return yield _this9.get(doc_id);
     })();
   }
@@ -381,13 +370,9 @@ module.exports = class Database {
     var _this14 = this;
 
     return _asyncToGenerator(function* () {
-      /* var that = this; */
-
-      /* return new Promise(async function (resolve, reject) { */
       if (keys.length == 0) {
         return [];
-      } // console.log("on Multiget", keys);
-
+      }
 
       if (_.isArray(keys) && keys.length > 0) {
         var functions = _.map(keys, key => (_this14.use_bucket_name ? _this14.connection : _this14.collection).get(key));
@@ -491,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, "`");
@@ -508,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) {
@@ -521,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.35",
+  "version": "2.0.37",
   "description": "",
   "main": "build/index.js",
   "scripts": {

package/src/index.js

@@ -211,20 +211,10 @@ module.exports = class Database {
         });
         return collectionSet;
       }
-      /* console.log("================================");
-      console.log(
-        "Collection Set",
-        spice?.db?.collections?.has(collection_name),
-        collection_name
-      ); */
       if (spice?.db?.collections?.has(collection_name)) {
-        //console.log("Using Internal Collection Set", true);
         return true;
       } else {
-        //console.log("Using Internal Collection Set", false);
-
         spice.db.collections = await loadAllCollections();
-        //console.log("Collection Set", spice.db.collections.entries());
         return spice?.db?.collections?.has(collection_name);
       }
     } catch (e) {
@@ -300,7 +290,6 @@ module.exports = class Database {
     } catch (e) {
       console.log(e.message, e, doc_id);
     }
-    console.log("Return from Insert", doc_id);
     return await this.get(doc_id);
   }
 
@@ -339,12 +328,9 @@ module.exports = class Database {
   }
 
   async multi_get(keys, keep_type) {
-    /* var that = this; */
-    /* return new Promise(async function (resolve, reject) { */
     if (keys.length == 0) {
       return [];
     }
-    // console.log("on Multiget", keys);
     if (_.isArray(keys) && keys.length > 0) {
       let functions = _.map(keys, (key) =>
         (this.use_bucket_name ? this.connection : this.collection).get(key)
@@ -431,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";
@@ -453,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) {
@@ -466,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}` : "";