forge-sql-orm 2.1.6 → 2.1.7

package/dist/ForgeSQLORM.js

@@ -1085,7 +1085,7 @@ async function processDDLResult(method, result) {
   if (result.metadata) {
     await saveMetaDataToContext(result.metadata);
   }
-  if (!result.rows) {
+  if (!result?.rows) {
     return { rows: [] };
   }
   if (isUpdateQueryResponse(result.rows)) {
@@ -1109,7 +1109,7 @@ async function processExecuteMethod(query, params) {
   }
   const result = await withTimeout$1(sqlStatement.execute());
   await saveMetaDataToContext(result.metadata);
-  if (!result.rows) {
+  if (!result?.rows) {
     return { rows: [] };
   }
   if (isUpdateQueryResponse(result.rows)) {
@@ -1125,7 +1125,7 @@ async function processAllMethod(query, params) {
   }
   const result = await withTimeout$1(sqlStatement.execute());
   await saveMetaDataToContext(result.metadata);
-  if (!result.rows) {
+  if (!result?.rows) {
     return { rows: [] };
   }
   const rows = result.rows.map((r) => Object.values(r));
@@ -1214,7 +1214,7 @@ async function handleSuccessfulExecution(rows, onfulfilled, table2, options, isC
     if (isCached && !cacheApplicationContext.getStore()) {
       await clearCache(table2, options);
     }
-    const result = onfulfilled?.(rows);
+    const result = onfulfilled ? onfulfilled(rows) : rows;
     return result;
   } catch (error) {
     if (shouldClearCacheOnError(error)) {
@@ -1285,11 +1285,11 @@ async function handleCachedQuery(target, options, cacheTtl, selections, aliasMap
   try {
     const localCached = await getQueryLocalCacheQuery(target, options);
     if (localCached) {
-      return onfulfilled?.(localCached);
+      return onfulfilled ? onfulfilled(localCached) : localCached;
     }
     const cacheResult = await getFromCache(target, options);
     if (cacheResult) {
-      return onfulfilled?.(cacheResult);
+      return onfulfilled ? onfulfilled(cacheResult) : cacheResult;
     }
     const rows = await target.execute();
     const transformed = applyFromDriverTransform(rows, selections, aliasMap);
@@ -1297,23 +1297,29 @@ async function handleCachedQuery(target, options, cacheTtl, selections, aliasMap
     await setCacheResult(target, options, transformed, cacheTtl).catch((cacheError) => {
       console.warn("Cache set error:", cacheError);
     });
-    return onfulfilled?.(transformed);
+    return onfulfilled ? onfulfilled(transformed) : transformed;
   } catch (error) {
-    return onrejected?.(error);
+    if (onrejected) {
+      return onrejected(error);
+    }
+    throw error;
   }
 }
 async function handleNonCachedQuery(target, options, selections, aliasMap, onfulfilled, onrejected) {
   try {
     const localCached = await getQueryLocalCacheQuery(target, options);
     if (localCached) {
-      return onfulfilled?.(localCached);
+      return onfulfilled ? onfulfilled(localCached) : localCached;
     }
     const rows = await target.execute();
     const transformed = applyFromDriverTransform(rows, selections, aliasMap);
     await saveQueryLocalCacheQuery(target, transformed, options);
-    return onfulfilled?.(transformed);
+    return onfulfilled ? onfulfilled(transformed) : transformed;
   } catch (error) {
-    return onrejected?.(error);
+    if (onrejected) {
+      return onrejected(error);
+    }
+    throw error;
   }
 }
 function createAliasedSelectBuilder(db, fields, selectFn, useCache, options, cacheTtl) {