spice-couchbase 2.0.20 → 2.0.22

package/build/index.js

@@ -77,6 +77,27 @@ module.exports = class Database {
     }
   }
 
+  setGlobalConnectionObject(connection) {
+    if (spice.checked_collections == undefined) {
+      spice.checked_collections = {};
+    }
+
+    _.set(spice.checked_collections, connection, true);
+  }
+
+  checkGlobelConnectionObject(connection) {
+    if (spice.checked_collections == undefined) {
+      spice.checked_collections = {};
+    }
+
+    if (_.get(spice.checked_collections, connection)) {
+      return true;
+    }
+
+    this.setGlobalConnectionObject(connection);
+    return false;
+  }
+
   connect(connection_name, config) {
     var _this = this;
 
@@ -147,10 +168,12 @@ module.exports = class Database {
       try {
         var collection_exists = yield _this3.collectionExists(_this3.collection_name, _this3.scope_name);
 
-        if (!collection_exists) {
-          yield _this3.createCollection(_this3.collection_name, _this3.scope_name);
-          yield _this3.wait(2000);
-          yield _this3.createPrimaryIndex(_this3.scope_name, _this3.collection_name);
+        if (!_this3.checkGlobelConnectionObject(_this3.collection_name)) {
+          if (!collection_exists) {
+            yield _this3.createCollection(_this3.collection_name, _this3.scope_name);
+            yield _this3.wait(2000);
+            yield _this3.createPrimaryIndex(_this3.scope_name, _this3.collection_name);
+          }
         }
       } catch (e) {
         console.log(e);
@@ -255,10 +278,15 @@ module.exports = class Database {
     var _this9 = this;
 
     return _asyncToGenerator(function* () {
-      console.log("insert", _this9.use_bucket_name, _this9.connection._name, _this9.collection._name);
-      yield (_this9.use_bucket_name ? _this9.connection : _this9.collection).insert(doc_id, document, {
-        expiry: expiry
-      });
+      try {
+        yield (_this9.use_bucket_name ? _this9.connection : _this9.collection).insert(doc_id, document, {
+          expiry: expiry
+        });
+      } catch (e) {
+        console.log(e.message, e, doc_id);
+      }
+
+      console.log("Return from Insert", doc_id);
       return yield _this9.get(doc_id);
     })();
   }

package/package.json

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

package/src/index.js

@@ -22,6 +22,7 @@ if (!Promise.allSettled) {
       )
     );
 }
+
 module.exports = class Database {
   constructor(
     connection,
@@ -85,6 +86,24 @@ module.exports = class Database {
     }
   }
 
+  setGlobalConnectionObject(connection) {
+    if (spice.checked_collections == undefined) {
+      spice.checked_collections = {};
+    }
+    _.set(spice.checked_collections, connection, true);
+  }
+
+  checkGlobelConnectionObject(connection) {
+    if (spice.checked_collections == undefined) {
+      spice.checked_collections = {};
+    }
+    if (_.get(spice.checked_collections, connection)) {
+      return true;
+    }
+    this.setGlobalConnectionObject(connection);
+    return false;
+  }
+
   async connect(connection_name, config) {
     let cluster = await couchbase.connect(config.nodes, {
       username: config.username,
@@ -153,10 +172,12 @@ module.exports = class Database {
         this.collection_name,
         this.scope_name
       );
-      if (!collection_exists) {
-        await this.createCollection(this.collection_name, this.scope_name);
-        await this.wait(2000);
-        await this.createPrimaryIndex(this.scope_name, this.collection_name);
+      if (!this.checkGlobelConnectionObject(this.collection_name)) {
+        if (!collection_exists) {
+          await this.createCollection(this.collection_name, this.scope_name);
+          await this.wait(2000);
+          await this.createPrimaryIndex(this.scope_name, this.collection_name);
+        }
       }
     } catch (e) {
       console.log(e);
@@ -245,19 +266,18 @@ module.exports = class Database {
   }
 
   async insert(doc_id, document, expiry) {
-    console.log(
-      "insert",
-      this.use_bucket_name,
-      this.connection._name,
-      this.collection._name
-    );
-    await (this.use_bucket_name ? this.connection : this.collection).insert(
-      doc_id,
-      document,
-      {
-        expiry: expiry,
-      }
-    );
+    try {
+      await (this.use_bucket_name ? this.connection : this.collection).insert(
+        doc_id,
+        document,
+        {
+          expiry: expiry,
+        }
+      );
+    } catch (e) {
+      console.log(e.message, e, doc_id);
+    }
+    console.log("Return from Insert", doc_id);
     return await this.get(doc_id);
   }
 
@@ -382,57 +402,32 @@ module.exports = class Database {
     type,
     columns,
     query,
-    limit,
-    offset,
+    limit = 0,
+    offset = 0,
     order_by,
-    do_count,
+    do_count = "false",
     query_scope
   ) {
-    let is_legacy =
+    const is_legacy =
       this.scope_name !== "_default" && this.collection_name !== "_default";
-    let alias = "_reference";
-    let bucket = `\`${
+    const 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";
-      }
-      var fix = "";
-      var count_query = "";
-      if (!limit) {
-        limit = 0;
-      }
-
-      if (!offset) {
-        offset = 0;
-      }
-
-      if (columns == "*") {
-        columns = "(" + bucket + ").*";
-        fix = ", META(" + bucket + ").id  AS id";
-      }
-
-      if (!columns) {
-        columns = "(" + bucket + ").*";
-        fix = ", META(" + bucket + ").id AS id";
-      }
+      const fix = `, META(${bucket}).id AS id`;
 
-      if (columns == "id") {
-        fix = ", META(" + bucket + ").id AS id";
+      if (columns === "*" || !columns) {
+        columns = `(${bucket}).*`;
+      } else if (columns !== "id") {
+        columns = `${columns}${fix}`;
+      } else {
         columns = "";
       }
 
-      var front_query = `SELECT ${columns} ${fix} FROM ${bucket}`;
-
-      if (is_legacy || query) {
-        front_query += " WHERE ";
-      }
+      const front_query = `SELECT ${columns} ${fix} FROM ${bucket}`;
+      const conditions = [];
 
-      let conditions = [];
       if (this.use_bucket_name) {
         conditions.push(`type = '${type}'`);
       }
@@ -440,34 +435,24 @@ module.exports = class Database {
         conditions.push(query);
       }
 
-      query = front_query + conditions.join(" AND ");
-
-      count_query = `SELECT count(meta().id) as count FROM ${bucket}`;
-      if (this.use_bucket_name || query) {
-        count_query += " WHERE ";
-      }
-      query = front_query + conditions.join(" AND ");
-
-      if (order_by) {
-        query = `${query} ORDER BY ${order_by}`;
-      }
+      const where_clause = conditions.length ? " WHERE " : "";
+      query = front_query + where_clause + conditions.join(" AND ");
 
-      if (limit > 0) {
-        query = query + " LIMIT " + limit;
-      }
+      const count_query = `SELECT count(meta().id) as count FROM ${bucket}${where_clause}`;
+      const order_by_clause = order_by ? ` ORDER BY ${order_by}` : "";
+      const limit_clause = limit > 0 ? ` LIMIT ${limit}` : "";
+      const offset_clause = offset > 0 ? ` OFFSET ${offset}` : "";
 
-      if (offset > 0) {
-        query = query + " OFFSET " + offset;
-      }
+      query = query + order_by_clause + limit_clause + offset_clause;
 
-      let active_query_space =
+      const active_query_space =
         query_scope || !this.use_bucket_name ? "scope" : "cluster";
 
-      let queries = [this.getData(query, active_query_space)];
+      const queries = [this.getData(query, active_query_space)];
       if (do_count === "true") {
         queries.push(this.getCount(count_query, active_query_space));
       }
-      let responses = await Promise.all(queries);
+      const responses = await Promise.all(queries);
 
       return {
         data: responses[0],