forge-sql-orm 2.1.7 → 2.1.8

package/dist/ForgeSQLORM.js

@@ -565,6 +565,9 @@ async function setCacheResult(query, options, results, cacheTtl) {
     console.error(`Error setting cache: ${error.message}`, error);
   }
 }
+function isQuery(obj) {
+  return typeof obj === "object" && obj !== null && typeof obj.sql === "string" && Array.isArray(obj.params);
+}
 const cacheApplicationContext = new node_async_hooks.AsyncLocalStorage();
 const localCacheApplicationContext = new node_async_hooks.AsyncLocalStorage();
 async function saveTableIfInsideCacheContext(table$1) {
@@ -580,7 +583,12 @@ async function saveQueryLocalCacheQuery(query, rows, options) {
     if (!context.cache) {
       context.cache = {};
     }
-    const sql2 = query;
+    let sql2;
+    if (isQuery(query)) {
+      sql2 = { toSQL: () => query };
+    } else {
+      sql2 = query;
+    }
     const key = hashKey(sql2.toSQL());
     context.cache[key] = {
       sql: sql2.toSQL().sql.toLowerCase(),
@@ -600,7 +608,12 @@ async function getQueryLocalCacheQuery(query, options) {
     if (!context.cache) {
       context.cache = {};
     }
-    const sql2 = query;
+    let sql2;
+    if (isQuery(query)) {
+      sql2 = { toSQL: () => query };
+    } else {
+      sql2 = query;
+    }
     const key = hashKey(sql2.toSQL());
     if (context.cache[key] && context.cache[key].sql === sql2.toSQL().sql.toLowerCase()) {
       if (options.logCache) {
@@ -1109,8 +1122,8 @@ async function processExecuteMethod(query, params) {
   }
   const result = await withTimeout$1(sqlStatement.execute());
   await saveMetaDataToContext(result.metadata);
-  if (!result?.rows) {
-    return { rows: [] };
+  if (!result?.rows || Array.isArray(result.rows) && result.rows.length === 0) {
+    return { rows: [void 0] };
   }
   if (isUpdateQueryResponse(result.rows)) {
     const oneRow = result.rows;