spice-couchbase 2.0.15 → 2.0.16

package/build/index.js

@@ -100,7 +100,6 @@ module.exports = class Database {
         var allUsers = yield _this2.userManager.getAllUsers({
           timeout: 6000
         });
-        console.log("UserName::::", _this2.db_config.username, allUsers);
         var update_user_response = yield _this2.userManager.upsertUser(_this2.db_config.username, {
           roles: [{
             name: "scope_admin",
@@ -110,7 +109,6 @@ module.exports = class Database {
             bucket: _this2.db_config.bucket
           }]
         });
-        console.log("UPdate Response", update_user_response);
       } catch (e) {
         console.log(e);
       }
@@ -231,7 +229,6 @@ module.exports = class Database {
     return _asyncToGenerator(function* () {
       try {
         var response = yield _this8.connection.get(doc_id);
-        console.log("Response ", response);
         return _objectSpread({
           id: doc_id
         }, response.content);
@@ -278,107 +275,46 @@ module.exports = class Database {
   }
 
   touch(doc_id) {
-    var expiry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-    var that = this;
-    return new Promise(
-    /*#__PURE__*/
-    function () {
-      var _ref3 = _asyncToGenerator(function* (resolve, reject) {
-        that.connection.touch(doc_id, expiry,
-        /*#__PURE__*/
-        function () {
-          var _ref4 = _asyncToGenerator(function* (err, res) {
-            if (err) {
-              reject(err);
-            } else {
-              try {
-                var created = yield that.get(doc_id);
-                resolve(created);
-              } catch (e) {
-                reject(e);
-              }
-            }
-          });
-
-          return function (_x7, _x8) {
-            return _ref4.apply(this, arguments);
-          };
-        }());
-      });
+    var _this9 = this;
 
-      return function (_x5, _x6) {
-        return _ref3.apply(this, arguments);
-      };
-    }());
+    var expiry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    return _asyncToGenerator(function* () {
+      yield _this9.connection.touch(doc_id, expiry);
+      return yield that.get(doc_id);
+    })();
   }
 
   count(doc_id, adjustment, initial_value) {
-    var that = this;
-    return new Promise(
-    /*#__PURE__*/
-    function () {
-      var _ref5 = _asyncToGenerator(function* (resolve, reject) {
-        that.connection.counter(doc_id, adjustment, {
-          initial: initial_value
-        }, function (err, res) {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(res.value);
-          }
-        });
-      });
+    var _this10 = this;
 
-      return function (_x9, _x10) {
-        return _ref5.apply(this, arguments);
-      };
-    }());
+    return _asyncToGenerator(function* () {
+      var res = yield _this10.connection.counter(doc_id, adjustment, {
+        initial: initial_value
+      });
+      return res.value;
+    })();
   }
 
   update(doc_id, document) {
-    var that = this;
-    return new Promise(
-    /*#__PURE__*/
-    function () {
-      var _ref6 = _asyncToGenerator(function* (resolve, reject) {
-        that.connection.replace(doc_id, document, function (err, res) {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(res.value);
-          }
-        });
-      });
+    var _this11 = this;
 
-      return function (_x11, _x12) {
-        return _ref6.apply(this, arguments);
-      };
-    }());
+    return _asyncToGenerator(function* () {
+      var res = yield _this11.connection.replace(doc_id, document);
+      return res.value;
+    })();
   }
 
   delete(doc_id) {
-    var that = this;
-    return new Promise(
-    /*#__PURE__*/
-    function () {
-      var _ref7 = _asyncToGenerator(function* (resolve, reject) {
-        that.connection.remove(doc_id, function (err, res) {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(res.value);
-          }
-        });
-      });
+    var _this12 = this;
 
-      return function (_x13, _x14) {
-        return _ref7.apply(this, arguments);
-      };
-    }());
+    return _asyncToGenerator(function* () {
+      var res = yield _this12.connection.remove(doc_id);
+      return res.value;
+    })();
   }
 
   multi_get(keys, keep_type) {
-    var _this9 = this;
+    var _this13 = this;
 
     return _asyncToGenerator(function* () {
       /* var that = this; */
@@ -390,7 +326,7 @@ module.exports = class Database {
 
 
       if (_.isArray(keys) && keys.length > 0) {
-        var functions = _.map(keys, key => _this9.connection.get(key));
+        var functions = _.map(keys, key => _this13.connection.get(key));
 
         var returned_all = yield Promise.allSettled(functions);
 
@@ -406,23 +342,6 @@ module.exports = class Database {
           res.value.id = keys[index];
           return res.value;
         });
-        /* that.connection.getMulti(keys, function (err, res) {
-            if (res) {
-              let return_value = [];
-              for (var i in res) {
-                if (res[i].value) {
-                  if (!keep_type) {
-                    delete res[i].value['type']
-                  }
-                  res[i].value.id = i;
-                  return_value.push(res[i].value);
-                }
-              }
-              resolve(return_value);
-            } else if (err) {
-              reject(err);
-            }
-          }); */
       } else {
         return [];
       }
@@ -434,7 +353,7 @@ module.exports = class Database {
     return new Promise(
     /*#__PURE__*/
     function () {
-      var _ref8 = _asyncToGenerator(function* (resolve, reject) {
+      var _ref3 = _asyncToGenerator(function* (resolve, reject) {
         var ViewQuery = couchbase.ViewQuery;
         var query = ViewQuery.from(design_doc, view);
 
@@ -461,7 +380,7 @@ module.exports = class Database {
         that.connection.query(query,
         /*#__PURE__*/
         function () {
-          var _ref9 = _asyncToGenerator(function* (err, results, matrix) {
+          var _ref4 = _asyncToGenerator(function* (err, results, matrix) {
             var return_value = [];
 
             if (err) {
@@ -484,27 +403,29 @@ module.exports = class Database {
             }
           });
 
-          return function (_x17, _x18, _x19) {
-            return _ref9.apply(this, arguments);
+          return function (_x7, _x8, _x9) {
+            return _ref4.apply(this, arguments);
           };
         }());
       });
 
-      return function (_x15, _x16) {
-        return _ref8.apply(this, arguments);
+      return function (_x5, _x6) {
+        return _ref3.apply(this, arguments);
       };
     }());
   }
 
   search(type, columns, query, limit, offset, order_by, do_count, query_scope) {
-    var _this10 = this;
+    var _this14 = this;
 
     return _asyncToGenerator(function* () {
+      var use_bucket_name = !(spice.config.database.connections[_this14.connection_name].scope && spice.config.database.connections[_this14.connection_name].collection);
+      var is_legacy = _this14.scope_name !== "_default" && _this14.collection_name !== "_default";
       var alias = "_reference";
-      var bucket = "`".concat(_this10.collection_name, "` AS ").concat(alias);
-      var include_type = _this10.scope_name && _this10.collection_name;
+      var bucket = "`".concat(use_bucket_name ? _this14.bucket : _this14.collection_name, "`");
 
       try {
+        //let uses_scopes = this.scope this.scope_name !== "_default";
         if (do_count == undefined) {
           do_count = "false";
         }
@@ -521,29 +442,29 @@ module.exports = class Database {
         }
 
         if (columns == "*") {
-          columns = "(" + alias + ").*";
-          fix = ", META(" + alias + ").id  AS id";
+          columns = "(" + bucket + ").*";
+          fix = ", META(" + bucket + ").id  AS id";
         }
 
         if (!columns) {
-          columns = "(" + alias + ").*";
-          fix = ", META(" + alias + ").id AS id";
+          columns = "(" + bucket + ").*";
+          fix = ", META(" + bucket + ").id AS id";
         }
 
         if (columns == "id") {
-          fix = ", META(" + alias + ").id AS id";
+          fix = ", META(" + bucket + ").id AS id";
           columns = "";
         }
 
         var front_query = "SELECT ".concat(columns, " ").concat(fix, " FROM ").concat(bucket);
 
-        if (include_type || query) {
+        if (is_legacy || query) {
           front_query += " WHERE ";
         }
 
         var conditions = [];
 
-        if (include_type) {
+        if (use_bucket_name) {
           conditions.push("type = '".concat(type, "'"));
         }
 
@@ -554,7 +475,7 @@ module.exports = class Database {
         query = front_query + conditions.join(" AND ");
         count_query = "SELECT count(meta().id) as count FROM ".concat(bucket);
 
-        if (include_type || query) {
+        if (use_bucket_name || query) {
           count_query += " WHERE ";
         }
 
@@ -572,13 +493,11 @@ module.exports = class Database {
           query = query + " OFFSET " + offset;
         }
 
-        var uses_scopes = _this10.scope_name !== "_default";
-        var active_query_space = query_scope || uses_scopes ? "scope" : "cluster";
-        console.log(active_query_space, _this10.scope_name, uses_scopes);
-        var queries = [_this10.getData(query, active_query_space)];
+        var active_query_space = query_scope || !use_bucket_name ? "scope" : "cluster";
+        var queries = [_this14.getData(query, active_query_space)];
 
         if (do_count === "true") {
-          queries.push(_this10.getCount(count_query, active_query_space));
+          queries.push(_this14.getCount(count_query, active_query_space));
         }
 
         var responses = yield Promise.all(queries);
@@ -599,7 +518,7 @@ module.exports = class Database {
     return new Promise(
     /*#__PURE__*/
     function () {
-      var _ref10 = _asyncToGenerator(function* (resolve, reject) {
+      var _ref5 = _asyncToGenerator(function* (resolve, reject) {
         try {
           var full_query = search_query + " AND type:" + type;
           var query = that.SearchQuery.new(that.full_text_index || full_text_index, that.SearchQuery.queryString(full_query));
@@ -620,7 +539,7 @@ module.exports = class Database {
           that.cluster.query(query,
           /*#__PURE__*/
           function () {
-            var _ref11 = _asyncToGenerator(function* (err, results, matrix) {
+            var _ref6 = _asyncToGenerator(function* (err, results, matrix) {
               var return_value = [];
 
               if (err) {
@@ -646,8 +565,8 @@ module.exports = class Database {
               }
             });
 
-            return function (_x22, _x23, _x24) {
-              return _ref11.apply(this, arguments);
+            return function (_x12, _x13, _x14) {
+              return _ref6.apply(this, arguments);
             };
           }());
         } catch (e) {
@@ -655,43 +574,43 @@ module.exports = class Database {
         }
       });
 
-      return function (_x20, _x21) {
-        return _ref10.apply(this, arguments);
+      return function (_x10, _x11) {
+        return _ref5.apply(this, arguments);
       };
     }());
   }
 
   getCount(count_query_element) {
-    var _this11 = this;
+    var _this15 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var response = yield _this11.query(count_query_element, query_scope);
+      var response = yield _this15.query(count_query_element, query_scope);
       return response.rows[0].count;
     })();
   }
 
   getData(query_element) {
-    var _this12 = this;
+    var _this16 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var response = yield _this12.query(query_element, query_scope);
+      var response = yield _this16.query(query_element, query_scope);
       return response.rows;
     })();
   }
 
   query(query) {
-    var _this13 = this;
+    var _this17 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var scope = query_scope || _this13.query_scope;
+      var scope = query_scope || _this17.query_scope;
 
       if (scope == "cluster") {
-        return yield _this13.cluster.query(query);
+        return yield _this17.cluster.query(query);
       } else {
-        return yield _this13.scope.query(query);
+        return yield _this17.scope.query(query);
       }
     })();
   }

package/package.json

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

package/src/index.js

@@ -70,6 +70,11 @@ module.exports = class Database {
       if (this.auto_create_collection) {
         this.upsertCollection();
       }
+
+      this.use_bucket_name = !(
+        spice.config.database.connections[this.connection_name].scope &&
+        spice.config.database.connections[this.connection_name].collection
+      );
     }
   }
 
@@ -105,7 +110,6 @@ module.exports = class Database {
   async assignUserPermission() {
     try {
       let allUsers = await this.userManager.getAllUsers({ timeout: 6000 });
-      console.log("UserName::::", this.db_config.username, allUsers);
       let update_user_response = await this.userManager.upsertUser(
         this.db_config.username,
         {
@@ -115,8 +119,6 @@ module.exports = class Database {
           ],
         }
       );
-
-      console.log("UPdate Response", update_user_response);
     } catch (e) {
       console.log(e);
     }
@@ -224,101 +226,60 @@ module.exports = class Database {
 
   async get(doc_id) {
     try {
-      let response = await this.connection.get(doc_id);
-      console.log("Response ", response);
+      let response = await (this.use_bucket_name
+        ? this.connection
+        : this.collection
+      ).get(doc_id);
+
       return { id: doc_id, ...response.content };
     } catch (e) {
       console.error(e);
     }
   }
 
-  insert(doc_id, document, expiry) {
-    var that = this;
-    return new Promise(async function (resolve, reject) {
-      that.connection.insert(
-        doc_id,
-        document,
-        {
-          expiry: expiry,
-        },
-        async function (err, res) {
-          if (err) {
-            reject(err);
-          } else {
-            try {
-              let created = await that.get(doc_id);
-              resolve(created);
-            } catch (e) {
-              reject(e);
-            }
-          }
-        }
-      );
-    });
+  async insert(doc_id, document, expiry) {
+    await (this.use_bucket_name ? this.connection : this.collection).insert(
+      doc_id,
+      document,
+      {
+        expiry: expiry,
+      }
+    );
+    return await this.get(doc_id);
   }
 
-  touch(doc_id, expiry = 0) {
-    var that = this;
-    return new Promise(async function (resolve, reject) {
-      that.connection.touch(doc_id, expiry, async function (err, res) {
-        if (err) {
-          reject(err);
-        } else {
-          try {
-            let created = await that.get(doc_id);
-            resolve(created);
-          } catch (e) {
-            reject(e);
-          }
-        }
-      });
-    });
+  async touch(doc_id, expiry = 0) {
+    await (this.use_bucket_name ? this.connection : this.collection).touch(
+      doc_id,
+      expiry
+    );
+    return await this.get(doc_id);
   }
 
-  count(doc_id, adjustment, initial_value) {
-    var that = this;
-    return new Promise(async function (resolve, reject) {
-      that.connection.counter(
-        doc_id,
-        adjustment,
-        {
-          initial: initial_value,
-        },
-        function (err, res) {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(res.value);
-          }
-        }
-      );
+  async count(doc_id, adjustment, initial_value) {
+    let res = await (this.use_bucket_name
+      ? this.connection
+      : this.collection
+    ).counter(doc_id, adjustment, {
+      initial: initial_value,
     });
+    return res.value;
   }
 
-  update(doc_id, document) {
-    var that = this;
-    return new Promise(async function (resolve, reject) {
-      that.connection.replace(doc_id, document, function (err, res) {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(res.value);
-        }
-      });
-    });
+  async update(doc_id, document) {
+    let res = await (this.use_bucket_name
+      ? this.connection
+      : this.collection
+    ).replace(doc_id, document);
+    return res.value;
   }
 
-  delete(doc_id) {
-    var that = this;
-    return new Promise(async function (resolve, reject) {
-      that.connection.remove(doc_id, function (err, res) {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(res.value);
-        }
-      });
-    });
+  async delete(doc_id) {
+    let res = await (this.use_bucket_name
+      ? this.connection
+      : this.collection
+    ).remove(doc_id);
+    return res.value;
   }
 
   async multi_get(keys, keep_type) {
@@ -329,7 +290,9 @@ module.exports = class Database {
     }
     // console.log("on Multiget", keys);
     if (_.isArray(keys) && keys.length > 0) {
-      let functions = _.map(keys, (key) => this.connection.get(key));
+      let functions = _.map(keys, (key) =>
+        (this.use_bucket_name ? this.connection : this.collection).get(key)
+      );
       let returned_all = await Promise.allSettled(functions);
 
       let responses = _.flatten(
@@ -347,24 +310,6 @@ module.exports = class Database {
         res.value.id = keys[index];
         return res.value;
       });
-
-      /* that.connection.getMulti(keys, function (err, res) {
-          if (res) {
-            let return_value = [];
-            for (var i in res) {
-              if (res[i].value) {
-                if (!keep_type) {
-                  delete res[i].value['type']
-                }
-                res[i].value.id = i;
-                return_value.push(res[i].value);
-              }
-            }
-            resolve(return_value);
-          } else if (err) {
-            reject(err);
-          }
-        }); */
     } else {
       return [];
     }
@@ -430,12 +375,16 @@ module.exports = class Database {
     do_count,
     query_scope
   ) {
+    let is_legacy =
+      this.scope_name !== "_default" && this.collection_name !== "_default";
     let alias = "_reference";
-    let bucket = `\`${this.collection_name}\` AS ${alias}`;
-
-    let include_type = this.scope_name && this.collection_name;
+    let bucket = `\`${
+      this.use_bucket_name ? this.bucket : this.collection_name
+    }\``;
 
     try {
+      //let uses_scopes = this.scope this.scope_name !== "_default";
+
       if (do_count == undefined) {
         do_count = "false";
       }
@@ -450,28 +399,28 @@ module.exports = class Database {
       }
 
       if (columns == "*") {
-        columns = "(" + alias + ").*";
-        fix = ", META(" + alias + ").id  AS id";
+        columns = "(" + bucket + ").*";
+        fix = ", META(" + bucket + ").id  AS id";
       }
 
       if (!columns) {
-        columns = "(" + alias + ").*";
-        fix = ", META(" + alias + ").id AS id";
+        columns = "(" + bucket + ").*";
+        fix = ", META(" + bucket + ").id AS id";
       }
 
       if (columns == "id") {
-        fix = ", META(" + alias + ").id AS id";
+        fix = ", META(" + bucket + ").id AS id";
         columns = "";
       }
 
       var front_query = `SELECT ${columns} ${fix} FROM ${bucket}`;
 
-      if (include_type || query) {
+      if (is_legacy || query) {
         front_query += " WHERE ";
       }
 
       let conditions = [];
-      if (include_type) {
+      if (this.use_bucket_name) {
         conditions.push(`type = '${type}'`);
       }
       if (query) {
@@ -481,7 +430,7 @@ module.exports = class Database {
       query = front_query + conditions.join(" AND ");
 
       count_query = `SELECT count(meta().id) as count FROM ${bucket}`;
-      if (include_type || query) {
+      if (this.use_bucket_name || query) {
         count_query += " WHERE ";
       }
       query = front_query + conditions.join(" AND ");
@@ -498,10 +447,8 @@ module.exports = class Database {
         query = query + " OFFSET " + offset;
       }
 
-      let uses_scopes = this.scope_name !== "_default";
-
-      let active_query_space = query_scope || uses_scopes ? "scope" : "cluster";
-      console.log(active_query_space, this.scope_name, uses_scopes);
+      let active_query_space =
+        query_scope || !this.use_bucket_name ? "scope" : "cluster";
 
       let queries = [this.getData(query, active_query_space)];
       if (do_count === "true") {