forge-sql-orm 2.1.11 → 2.1.12

package/dist/ForgeSQLORM.mjs

@@ -804,7 +804,14 @@ async function printQueriesWithPlan(forgeSQLORM, timeDiffMs, timeout) {
         and(
           isNotNull(statementsTable.digest),
           not(ilike(statementsTable.digestText, "%information_schema%")),
-          notInArray(statementsTable.stmtType, ["Use", "Set", "Show", "Commit", "Rollback", "Begin"]),
+          notInArray(statementsTable.stmtType, [
+            "Use",
+            "Set",
+            "Show",
+            "Commit",
+            "Rollback",
+            "Begin"
+          ]),
           gte(
             statementsTable.lastSeen,
             sql$1`DATE_SUB
@@ -866,9 +873,7 @@ async function slowQueryPerHours(forgeSQLORM, hours, timeout) {
       const message = `Found SlowQuery SQL: ${result.query} | Memory: ${memMaxMB.toFixed(2)} MB | Time: ${result.queryTime} ms
  Plan:${result.plan}`;
       response.push(message);
-      console.warn(
-        message
-      );
+      console.warn(message);
     });
     return response;
   } catch (error) {
@@ -876,16 +881,16 @@ async function slowQueryPerHours(forgeSQLORM, hours, timeout) {
       `Error occurred while retrieving query execution plan: ${error instanceof Error ? error.message : "Unknown error"}. Try again after some time`,
       error
     );
-    return [`Error occurred while retrieving query execution plan: ${error instanceof Error ? error.message : "Unknown error"}`];
+    return [
+      `Error occurred while retrieving query execution plan: ${error instanceof Error ? error.message : "Unknown error"}`
+    ];
   }
 }
 async function withTimeout(promise, message, timeoutMs2) {
   let timeoutId;
   const timeoutPromise = new Promise((_, reject) => {
     timeoutId = setTimeout(() => {
-      reject(
-        new Error(message)
-      );
+      reject(new Error(message));
     }, timeoutMs2);
   });
   try {
@@ -917,6 +922,17 @@ function nowPlusSeconds(secondsToAdd) {
   const dt = DateTime.now().plus({ seconds: secondsToAdd });
   return Math.floor(dt.toSeconds());
 }
+function extractBacktickedValues(sql2) {
+  const regex = /`([^`]+)`/g;
+  const matches = /* @__PURE__ */ new Set();
+  let match;
+  while ((match = regex.exec(sql2.toLowerCase())) !== null) {
+    if (!match[1].startsWith("a_")) {
+      matches.add(`\`${match[1]}\``);
+    }
+  }
+  return Array.from(matches).sort().join(",");
+}
 function hashKey(query) {
   const h = crypto.createHash("sha256");
   h.update(query.sql.toLowerCase());
@@ -1060,7 +1076,7 @@ async function getFromCache(query, options) {
   }
   try {
     const cacheResult = await kvs.entity(options.cacheEntityName).get(key);
-    if (cacheResult && cacheResult[expirationName] >= getCurrentTime() && sqlQuery.sql.toLowerCase() === cacheResult[entityQueryName]) {
+    if (cacheResult && cacheResult[expirationName] >= getCurrentTime() && extractBacktickedValues(sqlQuery.sql) === cacheResult[entityQueryName]) {
       if (options.logCache) {
         console.warn(`Get value from cache, cacheKey: ${key}`);
       }
@@ -1091,7 +1107,7 @@ async function setCacheResult(query, options, results, cacheTtl) {
     await kvs.transact().set(
       key,
       {
-        [entityQueryName]: sqlQuery.sql.toLowerCase(),
+        [entityQueryName]: extractBacktickedValues(sqlQuery.sql),
         [expirationName]: nowPlusSeconds(cacheTtl),
         [dataName]: JSON.stringify(results)
       },
@@ -1594,10 +1610,7 @@ async function saveMetaDataToContext(metadata) {
       if (process.env.NODE_ENV !== "test") {
         await new Promise((r) => setTimeout(r, 200));
       }
-      await printQueriesWithPlan(
-        context.forgeSQLORM,
-        Date.now() - context.beginTime.getTime()
-      );
+      await printQueriesWithPlan(context.forgeSQLORM, Date.now() - context.beginTime.getTime());
     };
     if (metadata) {
       context.totalResponseSize += metadata.responseSize;
@@ -1664,7 +1677,11 @@ async function processAllMethod(query, params) {
   if (params) {
     await sqlStatement.bindParams(...params);
   }
-  const result = await withTimeout(sqlStatement.execute(), timeoutMessage, timeoutMs);
+  const result = await withTimeout(
+    sqlStatement.execute(),
+    timeoutMessage,
+    timeoutMs
+  );
   await saveMetaDataToContext(result.metadata);
   if (!result.rows) {
     return { rows: [] };
@@ -1675,7 +1692,11 @@ async function processAllMethod(query, params) {
 const forgeDriver = async (query, params, method) => {
   const operationType = await getOperationType();
   if (operationType === "DDL") {
-    const result = await withTimeout(sql.executeDDL(inlineParams(query, params)), timeoutMessage, timeoutMs);
+    const result = await withTimeout(
+      sql.executeDDL(inlineParams(query, params)),
+      timeoutMessage,
+      timeoutMs
+    );
     return await processDDLResult(method, result);
   }
   if (method === "execute") {
@@ -3814,7 +3835,12 @@ const clearCacheSchedulerTrigger = async (options) => {
 };
 async function slowQuerySchedulerTrigger(forgeSQLORM, options) {
   try {
-    return getHttpResponse(200, JSON.stringify(await slowQueryPerHours(forgeSQLORM, options?.hours ?? 1, options?.timeout ?? 3e3)));
+    return getHttpResponse(
+      200,
+      JSON.stringify(
+        await slowQueryPerHours(forgeSQLORM, options?.hours ?? 1, options?.timeout ?? 3e3)
+      )
+    );
   } catch (error) {
     const errorMessage = error?.debug?.sqlMessage ?? error?.debug?.message ?? error.message ?? "Unknown error occurred";
     console.error(errorMessage);