spice-couchbase 2.0.52 → 2.0.53

package/build/index.js

@@ -177,6 +177,13 @@ module.exports = class Database {
     return "default:".concat(this.quoteIdentifier(this.db_config.bucket), ".").concat(this.quoteIdentifier(scope_name), ".").concat(this.quoteIdentifier(collection_name));
   }
 
+  isCollectionAlreadyExistsError(error) {
+    var _error$cause, _error$cause2, _error$context, _error$context2;
+
+    var message = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : (_error$cause = error.cause) === null || _error$cause === void 0 ? void 0 : _error$cause.first_error_message) || (error === null || error === void 0 ? void 0 : (_error$context = error.context) === null || _error$context === void 0 ? void 0 : _error$context.first_error_message) || (error === null || error === void 0 ? void 0 : (_error$context2 = error.context) === null || _error$context2 === void 0 ? void 0 : _error$context2.http_response_body) || "";
+    return error instanceof couchbase.CollectionExistsError || (error === null || error === void 0 ? void 0 : (_error$cause2 = error.cause) === null || _error$cause2 === void 0 ? void 0 : _error$cause2.first_error_code) === 12003 || (error === null || error === void 0 ? void 0 : (_error$cause2 = error.cause) === null || _error$cause2 === void 0 ? void 0 : _error$cause2.first_error_code) === 12027 || /collection .*already exists|already exists/i.test(message);
+  }
+
   upsertCollection() {
     var _this3 = this;
 
@@ -207,7 +214,7 @@ 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)) {
           return true;
         } else {
-          var response = yield _this4.cluster.query("SELECT RAW name\n           FROM system:keyspaces\n           WHERE bucket_id = ?\n             AND scope_id = ?\n             AND name = ?\n           LIMIT 1", {
+          var response = yield _this4.cluster.query("SELECT RAW keyspace_id\n           FROM system:keyspaces\n           WHERE bucket_id = ?\n             AND scope_id = ?\n             AND keyspace_id = ?\n           LIMIT 1", {
             parameters: [_this4.db_config.bucket, scope_name, collection_name],
             scanConsistency: QueryScanConsistency.RequestPlus
           });
@@ -237,9 +244,7 @@ module.exports = class Database {
         spice.db.collections.add(connection_name);
         return response;
       } catch (e) {
-        var _e$cause, _e$cause2;
-
-        if (e instanceof couchbase.CollectionExistsError || (e === null || e === void 0 ? void 0 : (_e$cause = e.cause) === null || _e$cause === void 0 ? void 0 : _e$cause.first_error_code) === 12003 || /collection .*already exists|already 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) || "")) {
+        if (_this5.isCollectionAlreadyExistsError(e)) {
           spice.db.collections.add(connection_name);
           return;
         }
@@ -873,4 +878,4 @@ module.exports = class Database {
     })();
   }
 
-};
+};

package/package.json

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

package/src/index.js

@@ -176,6 +176,21 @@ module.exports = class Database {
     )}.${this.quoteIdentifier(collection_name)}`;
   }
 
+  isCollectionAlreadyExistsError(error) {
+    const message =
+      error?.message ||
+      error?.cause?.first_error_message ||
+      error?.context?.first_error_message ||
+      error?.context?.http_response_body ||
+      "";
+    return (
+      error instanceof couchbase.CollectionExistsError ||
+      error?.cause?.first_error_code === 12003 ||
+      error?.cause?.first_error_code === 12027 ||
+      /collection .*already exists|already exists/i.test(message)
+    );
+  }
+
   async upsertCollection() {
     try {
       if (!this.checkGlobelConnectionObject(this.collection_name)) {
@@ -200,11 +215,11 @@ module.exports = class Database {
         return true;
       } else {
         let response = await this.cluster.query(
-          `SELECT RAW name
+          `SELECT RAW keyspace_id
            FROM system:keyspaces
            WHERE bucket_id = ?
              AND scope_id = ?
-             AND name = ?
+             AND keyspace_id = ?
            LIMIT 1`,
           {
             parameters: [this.db_config.bucket, scope_name, collection_name],
@@ -235,11 +250,7 @@ module.exports = class Database {
       return response;
     } catch (e) {
       if (
-        e instanceof couchbase.CollectionExistsError ||
-        e?.cause?.first_error_code === 12003 ||
-        /collection .*already exists|already exists/i.test(
-          e?.message || e?.cause?.first_error_message || "",
-        )
+        this.isCollectionAlreadyExistsError(e)
       ) {
         spice.db.collections.add(connection_name);
         return;