Updated connection cleanup process to ensure we cleanup connections t…

…hat have expired as well as the connections that exceed the config.maxIdle setting

lib/pool.js

@@ -200,9 +200,10 @@ class Pool extends EventEmitter {
     this._removeIdleTimeoutConnectionsTimer = setTimeout(() => {
       try {
         while (
-          this._freeConnections.length > this.config.maxIdle &&
-          Date.now() - this._freeConnections.get(0).lastActiveTime >
-            this.config.idleTimeout
+          this._freeConnections.length > this.config.maxIdle ||
+          (this._freeConnections.length > 0 &&
+            Date.now() - this._freeConnections.get(0).lastActiveTime >
+              this.config.idleTimeout)
         ) {
           this._freeConnections.get(0).destroy();
         }

test/integration/test-pool-release-idle-connection.test.cjs

@@ -39,7 +39,9 @@ pool.getConnection((err1, connection1) => {
           connection4.destroy();
           pool.end();
         });
-      }, 7000);
+        // Setting the time to a lower value than idleTimeout will ensure that the connection is not considered idle
+        // during our assertions
+      }, 4000);
     });
   });
 });