Merge pull request #626 from swymmwys/master

fix: unwrap sql result in case it returns array during supervise

Author: timgit

src/boss.js

@@ -1,5 +1,6 @@
 const EventEmitter = require('node:events')
 const plans = require('./plans')
+const { unwrapSQLResult } = require('./tools')
 
 const events = {
   error: 'error',
@@ -58,7 +59,7 @@ class Boss extends EventEmitter {
   async #executeSql (sql, values) {
     const started = Date.now()
 
-    const result = await this.#db.executeSql(sql, values)
+    const result = unwrapSQLResult(await this.#db.executeSql(sql, values))
 
     const ended = Date.now()
 
@@ -130,10 +131,8 @@ class Boss extends EventEmitter {
       const queues = rows.map(q => q.name)
 
       const cacheStatsSql = plans.cacheQueueStats(this.#config.schema, table, queues)
-      const results = await this.#executeSql(cacheStatsSql)
-
-      const inter = results.flatMap(i => i.rows)
-      const warnings = inter.filter(i => i.queuedCount > (i.warningQueueSize || WARNINGS.LARGE_QUEUE.size))
+      const { rows: rowsCacheStats } = await this.#executeSql(cacheStatsSql)
+      const warnings = rowsCacheStats.filter(i => i.queuedCount > (i.warningQueueSize || WARNINGS.LARGE_QUEUE.size))
 
       for (const warning of warnings) {
         this.emit(events.warning, { message: WARNINGS.LARGE_QUEUE.mesasge, data: warning })

src/tools.js

@@ -2,7 +2,22 @@ const { setTimeout } = require('node:timers/promises')
 
 module.exports = {
   delay,
-  resolveWithinSeconds
+  resolveWithinSeconds,
+  unwrapSQLResult
+}
+
+/**
+ * When sql contains multiple queries, result is an array of objects with rows property
+ * This function unwraps the result into a single object with rows property
+ * @param {{rows: Array<Object>} | Array<{rows: Array<Object>}>} result
+ * @returns {{rows: Array<Object>}}
+*/
+function unwrapSQLResult (result) {
+  if (result instanceof Array) {
+    return { rows: result.flatMap(i => i.rows) }
+  }
+
+  return result
 }
 
 function delay (ms, error) {

test/toolsTest.js

@@ -0,0 +1,30 @@
+const assert = require('node:assert')
+
+describe('tools.unwrapSQLResult', function () {
+  it('should return the same object when input is an object with rows', function () {
+    const { unwrapSQLResult } = require('../src/tools')
+
+    const input = { rows: [{ id: 1 }, { id: 2 }] }
+    const output = unwrapSQLResult(input)
+
+    assert.strictEqual(output, input)
+    assert.deepStrictEqual(output, input)
+  })
+
+  it('should flatten an array of results into a single rows array', function () {
+    const { unwrapSQLResult } = require('../src/tools')
+
+    const part1 = { rows: [{ id: 'a' }] }
+    const part2 = { rows: [{ id: 'b' }, { id: 'c' }] }
+    const output = unwrapSQLResult([part1, part2])
+
+    assert.deepStrictEqual(output, { rows: [part1.rows, part2.rows].flat() })
+  })
+
+  it('should handle empty array by returning empty rows', function () {
+    const { unwrapSQLResult } = require('../src/tools')
+
+    const output = unwrapSQLResult([])
+    assert.deepStrictEqual(output, { rows: [] })
+  })
+})