spice-couchbase 2.0.52 → 2.0.54

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$context, _error$context2, _error$cause2, _error$cause3;
+
+    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$cause3 = error.cause) === null || _error$cause3 === void 0 ? void 0 : _error$cause3.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;
         }
@@ -278,9 +283,9 @@ module.exports = class Database {
         var response = yield _this7.query("CREATE PRIMARY INDEX ON ".concat(_this7.collectionPath(scope_name, col_name)));
         return response;
       } catch (e) {
-        var _e$cause3, _e$cause4;
+        var _e$cause, _e$cause2;
 
-        if (e instanceof couchbase.IndexExistsError || (e === null || e === void 0 ? void 0 : (_e$cause3 = e.cause) === null || _e$cause3 === void 0 ? void 0 : _e$cause3.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$cause4 = e.cause) === null || _e$cause4 === void 0 ? void 0 : _e$cause4.first_error_message) || "")) {
+        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;
         }
 
@@ -865,7 +870,7 @@ module.exports = class Database {
 
       var durationInMilliseconds = (endTime - startTime) / BigInt(1000000); // optimize if response time is greater than 1 second
 
-      if (durationInMilliseconds > 2000) {
+      if (durationInMilliseconds > 1000) {
         _this20.optimize(query, exec_scope);
       }
 

package/build/utility.js

@@ -284,8 +284,21 @@ function splitSelectClause(clause) {
 
   return parts;
 }
+
+function hasQualifiedWildcardProjection(query) {
+  var selectMatch = query.match(/\bSELECT\b([\s\S]+?)\bFROM\b/i);
+
+  if (!selectMatch) {
+    return false;
+  }
+
+  return splitSelectClause(selectMatch[1].trim()).some(part => {
+    var trimmedPart = part.trim();
+    return /^\(\s*`?\w+`?\s*\)\s*\.\s*\*$/.test(trimmedPart) || /^`?\w+`?\s*\.\s*\*$/.test(trimmedPart);
+  });
+}
 /**
- * Builds a covering index CREATE statement from a query
+ * Builds a covering or fallback non-covering index CREATE statement from a query
  * @param {string} query - The N1QL query to analyze
  * @param {Object} options - Configuration options
  * @param {string} options.bucket - The bucket name
@@ -298,19 +311,19 @@ function splitSelectClause(clause) {
 function buildCoveringIndex(query, options) {
   var {
     bucket,
-    scope,
-    collection
+    scope = "_default",
+    collection = "_default"
   } = options;
 
-  if (!bucket || !scope || !collection) {
+  if (!bucket) {
     return null;
   } // Extract fields from SELECT clause
 
 
   var selectFields = extractSelectFields(query);
+  var isNonCoveringFallback = selectFields === null && hasQualifiedWildcardProjection(query);
 
-  if (selectFields === null) {
-    // SELECT * query - cannot create covering index
+  if (selectFields === null && !isNonCoveringFallback) {
     return null;
   } // Extract fields from WHERE clause
 
@@ -349,7 +362,7 @@ function buildCoveringIndex(query, options) {
     return true;
   }); // Filter SELECT fields (remove duplicates from WHERE, GROUP BY, and ORDER BY, remove deleted)
 
-  var selectFieldsFiltered = selectFields.filter(f => {
+  var selectFieldsFiltered = (selectFields || []).filter(f => {
     var lower = f.toLowerCase();
 
     if (addedFields.has(lower) || lower === "deleted") {
@@ -373,9 +386,10 @@ function buildCoveringIndex(query, options) {
 
   var indexFieldsKey = allFields.map(field => formatIndexKey(field, orderDirectionMap)).sort().join(",");
   var orderFieldsKey = orderByIndexFields.map(field => formatIndexKey(field.name, orderDirectionMap)).join(",");
-  var indexKey = "".concat(bucket, "|").concat(scope, "|").concat(collection, "|fields:").concat(indexFieldsKey, "|order:").concat(orderFieldsKey);
+  var indexMode = isNonCoveringFallback ? "noncovered" : "covered";
+  var indexKey = "".concat(bucket, "|").concat(scope, "|").concat(collection, "|mode:").concat(indexMode, "|fields:").concat(indexFieldsKey, "|order:").concat(orderFieldsKey);
   var hash = generateHash(indexKey);
-  var indexName = "adv_covered_".concat(hash); // Build the CREATE INDEX statement
+  var indexName = "adv_".concat(indexMode, "_").concat(hash); // Build the CREATE INDEX statement
 
   var indexStatement = "CREATE INDEX `".concat(indexName, "` ON `default`:`").concat(bucket, "`.`").concat(scope, "`.`").concat(collection, "`(").concat(fieldList, ")");
   return indexStatement;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-couchbase",
-  "version": "2.0.52",
+  "version": "2.0.54",
   "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],
@@ -234,13 +249,7 @@ module.exports = class Database {
       spice.db.collections.add(connection_name);
       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 || "",
-        )
-      ) {
+      if (this.isCollectionAlreadyExistsError(e)) {
         spice.db.collections.add(connection_name);
         return;
       }
@@ -784,7 +793,7 @@ module.exports = class Database {
     // Calculate duration in microseconds
     let durationInMilliseconds = (endTime - startTime) / BigInt(1000000);
     // optimize if response time is greater than 1 second
-    if (durationInMilliseconds > 2000) {
+    if (durationInMilliseconds > 1000) {
       this.optimize(query, exec_scope);
     }
     return response;

package/src/utility.js

@@ -293,8 +293,23 @@ function splitSelectClause(clause) {
   return parts;
 }
 
+function hasQualifiedWildcardProjection(query) {
+  const selectMatch = query.match(/\bSELECT\b(.+?)\bFROM\b/is);
+  if (!selectMatch) {
+    return false;
+  }
+
+  return splitSelectClause(selectMatch[1].trim()).some((part) => {
+    const trimmedPart = part.trim();
+    return (
+      /^\(\s*`?\w+`?\s*\)\s*\.\s*\*$/.test(trimmedPart) ||
+      /^`?\w+`?\s*\.\s*\*$/.test(trimmedPart)
+    );
+  });
+}
+
 /**
- * Builds a covering index CREATE statement from a query
+ * Builds a covering or fallback non-covering index CREATE statement from a query
  * @param {string} query - The N1QL query to analyze
  * @param {Object} options - Configuration options
  * @param {string} options.bucket - The bucket name
@@ -303,16 +318,17 @@ function splitSelectClause(clause) {
  * @returns {string|null} - The CREATE INDEX statement, or null if cannot build
  */
 function buildCoveringIndex(query, options) {
-  const { bucket, scope, collection } = options;
+  const { bucket, scope = "_default", collection = "_default" } = options;
 
-  if (!bucket || !scope || !collection) {
+  if (!bucket) {
     return null;
   }
 
   // Extract fields from SELECT clause
   const selectFields = extractSelectFields(query);
-  if (selectFields === null) {
-    // SELECT * query - cannot create covering index
+  const isNonCoveringFallback =
+    selectFields === null && hasQualifiedWildcardProjection(query);
+  if (selectFields === null && !isNonCoveringFallback) {
     return null;
   }
 
@@ -356,7 +372,7 @@ function buildCoveringIndex(query, options) {
   });
 
   // Filter SELECT fields (remove duplicates from WHERE, GROUP BY, and ORDER BY, remove deleted)
-  const selectFieldsFiltered = selectFields.filter((f) => {
+  const selectFieldsFiltered = (selectFields || []).filter((f) => {
     const lower = f.toLowerCase();
     if (addedFields.has(lower) || lower === "deleted") {
       return false;
@@ -393,9 +409,10 @@ function buildCoveringIndex(query, options) {
   const orderFieldsKey = orderByIndexFields
     .map((field) => formatIndexKey(field.name, orderDirectionMap))
     .join(",");
-  const indexKey = `${bucket}|${scope}|${collection}|fields:${indexFieldsKey}|order:${orderFieldsKey}`;
+  const indexMode = isNonCoveringFallback ? "noncovered" : "covered";
+  const indexKey = `${bucket}|${scope}|${collection}|mode:${indexMode}|fields:${indexFieldsKey}|order:${orderFieldsKey}`;
   const hash = generateHash(indexKey);
-  const indexName = `adv_covered_${hash}`;
+  const indexName = `adv_${indexMode}_${hash}`;
 
   // Build the CREATE INDEX statement
   const indexStatement = `CREATE INDEX \`${indexName}\` ON \`default\`:\`${bucket}\`.\`${scope}\`.\`${collection}\`(${fieldList})`;