spice-couchbase 2.0.50 → 2.0.51

package/build/index.js

@@ -280,15 +280,11 @@ module.exports = class Database {
 
     return _asyncToGenerator(function* () {
       try {
-        var response = yield _this6.cluster.query("SELECT RAW name\n         FROM system:indexes\n         WHERE bucket_id = $bucket\n           AND scope_id = $scope\n           AND keyspace_id = $collection\n           AND is_primary = true\n         LIMIT 1", {
-          namedParameters: {
-            bucket: _this6.db_config.bucket,
-            scope: scope_name,
-            collection: col_name
-          },
+        var response = yield _this6.cluster.query("SELECT RAW name\n         FROM system:indexes\n         WHERE bucket_id = ?\n           AND scope_id = ?\n           AND keyspace_id = ?\n           AND is_primary = true\n         LIMIT 1", {
+          parameters: [_this6.db_config.bucket, scope_name, col_name],
           scanConsistency: QueryScanConsistency.RequestPlus
         });
-        return Array.isArray(response && response.rows) && response.rows.length > 0;
+        return Array.isArray(response === null || response === void 0 ? void 0 : response.rows) && response.rows.length > 0;
       } catch (e) {
         console.log("Primary index lookup failed:", e);
         return false;
@@ -297,28 +293,34 @@ module.exports = class Database {
   }
 
   createPrimaryIndex(scope_name, col_name) {
-    var _this6 = this;
+    var _this7 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        if (yield _this6.primaryIndexExists(scope_name, col_name)) {
+        if (yield _this7.primaryIndexExists(scope_name, col_name)) {
           return;
         }
 
-        var response = yield _this6.query("CREATE PRIMARY INDEX ON default:`".concat(_this6.db_config.bucket, "`.`").concat(scope_name, "`.`").concat(col_name, "`"));
+        var response = yield _this7.query("CREATE PRIMARY INDEX ON default:`".concat(_this7.db_config.bucket, "`.`").concat(scope_name, "`.`").concat(col_name, "`"));
         return response;
       } catch (e) {
+        var _e$cause, _e$cause2;
+
+        if (e instanceof couchbase.IndexExistsError || (e === null || e === void 0 ? void 0 : (_e$cause = e.cause) === null || _e$cause === void 0 ? void 0 : _e$cause.first_error_code) === 4300 || /index .*already exists|index_exists/i.test((e === null || e === void 0 ? void 0 : e.message) || (e === null || e === void 0 ? void 0 : (_e$cause2 = e.cause) === null || _e$cause2 === void 0 ? void 0 : _e$cause2.first_error_message) || "")) {
+          return;
+        }
+
         console.log("CREATE Index :::", e);
       }
     })();
   }
 
   createScope(scope_name) {
-    var _this7 = this;
+    var _this8 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        yield _this7.collection_manager.createScope(scope_name);
+        yield _this8.collection_manager.createScope(scope_name);
       } catch (e) {
         if (e instanceof couchbase.ScopeExistsError) {
           console.log("The scope already exists");
@@ -330,7 +332,7 @@ module.exports = class Database {
   }
 
   get(doc_id) {
-    var _this8 = this;
+    var _this9 = this;
 
     var {
       columns = []
@@ -338,7 +340,7 @@ module.exports = class Database {
     return _asyncToGenerator(function* () {
       try {
         var useLookupIn = columns.length > 0;
-        var collection = _this8.use_bucket_name ? _this8.connection : _this8.collection;
+        var collection = _this9.use_bucket_name ? _this9.connection : _this9.collection;
 
         if (!useLookupIn) {
           var response = yield collection.get(doc_id);
@@ -379,36 +381,36 @@ module.exports = class Database {
   }
 
   insert(doc_id, document, expiry) {
-    var _this9 = this;
+    var _this10 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        yield (_this9.use_bucket_name ? _this9.connection : _this9.collection).insert(doc_id, document, {
+        yield (_this10.use_bucket_name ? _this10.connection : _this10.collection).insert(doc_id, document, {
           expiry: expiry
         });
       } catch (e) {
         console.log(e.message, e, doc_id);
       }
 
-      return yield _this9.get(doc_id);
+      return yield _this10.get(doc_id);
     })();
   }
 
   touch(doc_id) {
-    var _this10 = this;
+    var _this11 = this;
 
     var expiry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     return _asyncToGenerator(function* () {
-      yield (_this10.use_bucket_name ? _this10.connection : _this10.collection).touch(doc_id, expiry);
-      return yield _this10.get(doc_id);
+      yield (_this11.use_bucket_name ? _this11.connection : _this11.collection).touch(doc_id, expiry);
+      return yield _this11.get(doc_id);
     })();
   }
 
   count(doc_id, adjustment, initial_value) {
-    var _this11 = this;
+    var _this12 = this;
 
     return _asyncToGenerator(function* () {
-      var res = yield (_this11.use_bucket_name ? _this11.connection : _this11.collection).counter(doc_id, adjustment, {
+      var res = yield (_this12.use_bucket_name ? _this12.connection : _this12.collection).counter(doc_id, adjustment, {
         initial: initial_value
       });
       return res.value;
@@ -416,10 +418,10 @@ module.exports = class Database {
   }
 
   update(doc_id, document, expiry) {
-    var _this12 = this;
+    var _this13 = this;
 
     return _asyncToGenerator(function* () {
-      var res = yield (_this12.use_bucket_name ? _this12.connection : _this12.collection).replace(doc_id, document, {
+      var res = yield (_this13.use_bucket_name ? _this13.connection : _this13.collection).replace(doc_id, document, {
         expiry: expiry
       });
       return res.value;
@@ -427,16 +429,16 @@ module.exports = class Database {
   }
 
   delete(doc_id) {
-    var _this13 = this;
+    var _this14 = this;
 
     return _asyncToGenerator(function* () {
-      var res = yield (_this13.use_bucket_name ? _this13.connection : _this13.collection).remove(doc_id);
+      var res = yield (_this14.use_bucket_name ? _this14.connection : _this14.collection).remove(doc_id);
       return res.value;
     })();
   }
 
   multi_get(keys) {
-    var _this14 = this;
+    var _this15 = this;
 
     var {
       keep_type = true,
@@ -449,7 +451,7 @@ module.exports = class Database {
 
       if (_.isArray(keys) && keys.length > 0) {
         var useLookupIn = columns.length > 0;
-        var collection = _this14.use_bucket_name ? _this14.connection : _this14.collection;
+        var collection = _this15.use_bucket_name ? _this15.connection : _this15.collection;
 
         if (!useLookupIn) {
           // Regular get - no batching needed
@@ -609,7 +611,7 @@ module.exports = class Database {
   }
 
   search(type) {
-    var _this15 = this;
+    var _this16 = this;
 
     var columns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
     var query = arguments.length > 2 ? arguments[2] : undefined;
@@ -620,8 +622,8 @@ module.exports = class Database {
     var query_scope = arguments.length > 7 ? arguments[7] : undefined;
     var join = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : "";
     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, "`");
+      var is_legacy = _this16.scope_name !== "_default" && _this16.collection_name !== "_default";
+      var bucket = "`".concat(_this16.use_bucket_name ? _this16.bucket : _this16.collection_name, "`");
 
       function processColumns(columnsStr) {
         // If columns is empty or *, return default
@@ -666,7 +668,7 @@ module.exports = class Database {
         var front_query = "SELECT ".concat(columns, " FROM ").concat(bucket, " ").concat(join);
         var conditions = [];
 
-        if (_this15.use_bucket_name) {
+        if (_this16.use_bucket_name) {
           conditions.push("type = '".concat(type, "'"));
         }
 
@@ -682,11 +684,11 @@ module.exports = class Database {
         var limit_clause = limit > 0 ? " LIMIT ".concat(limit) : "";
         var offset_clause = offset > 0 ? " OFFSET ".concat(offset) : "";
         query = query + order_by_clause + limit_clause + offset_clause;
-        var active_query_space = query_scope || !_this15.use_bucket_name ? "scope" : "cluster";
-        var queries = [_this15.getData(query, active_query_space)];
+        var active_query_space = query_scope || !_this16.use_bucket_name ? "scope" : "cluster";
+        var queries = [_this16.getData(query, active_query_space)];
 
         if (do_count != "false") {
-          queries.push(_this15.getCount(count_query, active_query_space));
+          queries.push(_this16.getCount(count_query, active_query_space));
         }
 
         var responses = yield Promise.all(queries);
@@ -770,21 +772,21 @@ module.exports = class Database {
   }
 
   getCount(count_query_element) {
-    var _this16 = this;
+    var _this17 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var response = yield _this16.query(count_query_element, query_scope);
+      var response = yield _this17.query(count_query_element, query_scope);
       return response.rows[0].count;
     })();
   }
 
   getData(query_element) {
-    var _this17 = this;
+    var _this18 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var response = yield _this17.query(query_element, query_scope);
+      var response = yield _this18.query(query_element, query_scope);
       return response.rows;
     })();
   }
@@ -826,7 +828,7 @@ module.exports = class Database {
   }
 
   optimize(query, exec_scope) {
-    var _this18 = this;
+    var _this19 = this;
 
     return _asyncToGenerator(function* () {
       try {
@@ -842,16 +844,16 @@ module.exports = class Database {
 
         var plan = explainResponse === null || explainResponse === void 0 ? void 0 : (_explainResponse$rows = explainResponse.rows) === null || _explainResponse$rows === void 0 ? void 0 : _explainResponse$rows[0];
 
-        if (!_this18.hasFetchOperator(plan)) {
+        if (!_this19.hasFetchOperator(plan)) {
           // Query is already covered, no need to create index
           return;
         } // 3. Build covering index from the query
 
 
         var indexStatement = buildCoveringIndex(query, {
-          bucket: _this18.bucket,
-          scope: _this18.scope_name,
-          collection: _this18.collection_name
+          bucket: _this19.bucket,
+          scope: _this19.scope_name,
+          collection: _this19.collection_name
         }); // 4. Execute the index creation if we got a valid statement
 
         if (indexStatement) {
@@ -863,19 +865,19 @@ module.exports = class Database {
   }
 
   query(query) {
-    var _this19 = this;
+    var _this20 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var scope = query_scope || _this19.query_scope;
+      var scope = query_scope || _this20.query_scope;
       var sanitizedQuery = query; //sanitization step to be implemented
 
       var exec_scope = null;
 
       if (scope === "cluster") {
-        exec_scope = _this19.cluster;
+        exec_scope = _this20.cluster;
       } else {
-        exec_scope = _this19.scope;
+        exec_scope = _this20.scope;
       } // Start time
 
 
@@ -890,11 +892,11 @@ module.exports = class Database {
       var durationInMilliseconds = (endTime - startTime) / BigInt(1000000); // optimize if response time is greater than 1 second
 
       if (durationInMilliseconds > 2000) {
-        _this19.optimize(query, exec_scope);
+        _this20.optimize(query, exec_scope);
       }
 
       return response;
     })();
   }
 
-};
+};

package/build/utility.js

@@ -389,4 +389,4 @@ module.exports = {
   extractOrderByFields,
   extractOrderByIndexFields,
   generateHash
-};
+};

package/build/utility.test.js

@@ -831,4 +831,4 @@ test("field order: WHERE -> GROUP BY -> ORDER BY -> SELECT", () => {
 console.log("\n========================================");
 console.log("Tests: ".concat(passed + failed, " | Passed: ").concat(passed, " | Failed: ").concat(failed));
 console.log("========================================\n");
-process.exit(failed > 0 ? 1 : 0);
+process.exit(failed > 0 ? 1 : 0);

package/package.json

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

package/src/index.js

@@ -255,17 +255,13 @@ module.exports = class Database {
       let response = await this.cluster.query(
         `SELECT RAW name
          FROM system:indexes
-         WHERE bucket_id = $bucket
-           AND scope_id = $scope
-           AND keyspace_id = $collection
+         WHERE bucket_id = ?
+           AND scope_id = ?
+           AND keyspace_id = ?
            AND is_primary = true
          LIMIT 1`,
         {
-          namedParameters: {
-            bucket: this.db_config.bucket,
-            scope: scope_name,
-            collection: col_name,
-          },
+          parameters: [this.db_config.bucket, scope_name, col_name],
           scanConsistency: QueryScanConsistency.RequestPlus,
         },
       );
@@ -286,6 +282,15 @@ module.exports = class Database {
       );
       return response;
     } catch (e) {
+      if (
+        e instanceof couchbase.IndexExistsError ||
+        e?.cause?.first_error_code === 4300 ||
+        /index .*already exists|index_exists/i.test(
+          e?.message || e?.cause?.first_error_message || "",
+        )
+      ) {
+        return;
+      }
       console.log("CREATE Index :::", e);
     }
   }