fix: use for of loop to iterate over registered connections

FIXES: #536
adonisjs · Apr 30, 2020 · bfdf53a · bfdf53a
1 parent d39424a
commit bfdf53a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/Database/index.ts b/src/Database/index.ts
@@ -16,7 +16,6 @@ import { ProfilerContract } from '@ioc:Adonis/Core/Profiler'
 
 import {
   DatabaseConfig,
-  ConnectionNode,
   DatabaseContract,
   DatabaseClientOptions,
   TransactionClientContract,
@@ -83,10 +82,12 @@ export class Database implements DatabaseContract {
    * health checker on demand.
    */
   private findIfHealthChecksAreEnabled () {
-    this.hasHealthChecksEnabled = !!Object.keys(this.manager.connections).find((key) => {
-      const connection = this.manager.connections[key] as ConnectionNode
-      return !!connection.config.healthCheck
-    })
+    for (let [,conn] of this.manager.connections) {
+      if (conn.config.healthCheck) {
+        this.hasHealthChecksEnabled = true
+        break
+      }
+    }
   }
 
   /**

diff --git a/test/database/database.spec.ts b/test/database/database.spec.ts
@@ -185,6 +185,20 @@ test.group('Database', (group) => {
 
     await db.manager.closeAll()
   })
+
+  test(
+    'set hasHealthChecks enabled flag to true, when one ore more connections are using health checks',
+    async (assert) => {
+      const config = {
+        connection: 'primary',
+        connections: { primary: Object.assign({}, getConfig(), { healthCheck: true }) },
+      }
+
+      const db = new Database(config, getLogger(), getProfiler(), getEmitter())
+      assert.isTrue(db.hasHealthChecksEnabled)
+      await db.manager.closeAll()
+    }
+  )
 })
 
 test.group('Database | extend', (group) => {