squirreling 0.15.0 → 0.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squirreling",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Squirreling Async SQL Engine",
   "author": "Hyperparam",
   "homepage": "https://hyperparam.app",
@@ -39,10 +39,10 @@
     "test": "vitest run"
   },
   "devDependencies": {
-    "@types/node": "26.1.1",
+    "@types/node": "26.2.0",
     "@vitest/coverage-v8": "4.1.10",
     "eslint": "9.39.4",
-    "eslint-plugin-jsdoc": "63.0.13",
+    "eslint-plugin-jsdoc": "64.1.0",
     "typescript": "7.0.2",
     "vitest": "4.1.10"
   }

package/src/execute/streamingAggregate.js

@@ -166,6 +166,9 @@ export function planStreamingAggregates({ columns, having, orderBy, groupBy }, c
     case 'function': {
       const funcName = node.funcName.toUpperCase()
       if (!isAggregateFunc(funcName)) {
+        if (funcName === 'COALESCE') {
+          return node.args.every((arg, i) => walk(arg, lazy || i > 0))
+        }
         return node.args.every(arg => walk(arg, lazy))
       }
       if (!STREAMABLE_FUNCS.has(funcName)) return false

package/src/expression/evaluate.js

@@ -394,6 +394,18 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
       }
     }
 
+    // COALESCE must be handled before the eager arg evaluation below, or it
+    // evaluates every argument once eagerly and the arguments up to the first
+    // non-null value a second time. Nested calls compound that duplication.
+    if (funcName === 'COALESCE') {
+      // Short-circuit: evaluate args one at a time, return first non-null
+      for (const arg of node.args) {
+        const val = await evaluateExpr({ node: arg, row, rowIndex, rows, context })
+        if (val != null) return val
+      }
+      return null
+    }
+
     /** @type {SqlPrimitive[]} */
     const args = node.args.length === 1
       ? [await evaluateExpr({ node: node.args[0], row, rowIndex, rows, context })]
@@ -415,20 +427,9 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
       return evaluateSpatialFunc({ funcName, args })
     }
 
-    if (funcName === 'COALESCE') {
-      // Short-circuit: evaluate args one at a time, return first non-null
-      for (const arg of node.args) {
-        const val = await evaluateExpr({ node: arg, row, rowIndex, rows, context })
-        if (val != null) return val
-      }
-      return null
-    }
-
     if (funcName === 'NULLIF') {
       // NULLIF(a, b) returns null if a = b, otherwise returns a
-      const val2 = evaluateExpr({ node: node.args[1], row, rowIndex, rows, context })
-      const val1 = await evaluateExpr({ node: node.args[0], row, rowIndex, rows, context })
-      return val1 == await val2 ? null : val1
+      return args[0] == args[1] ? null : args[0]
     }
 
     if (funcName === 'GREATEST' || funcName === 'LEAST') {