Only callback after the connection is released

Fixes loopbackio/loopback-next#3296
loopbackio · Nov 1, 2019 · 4223d35 · 4223d35
1 parent 50000d6
commit 4223d35
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/lib/oracle.js b/lib/oracle.js
@@ -244,7 +244,6 @@ Oracle.prototype.executeSQL = function(sql, params, options, callback) {
         }
 
         if (!err && data) {
-          const lobs = [];
           if (data.rows) {
             data = data.rows;
             if (self.settings.debug && data) {
@@ -255,15 +254,15 @@ Oracle.prototype.executeSQL = function(sql, params, options, callback) {
         releaseConnectionAndCallback();
 
         function releaseConnectionAndCallback() {
-          connection.release(function(err) {
-            if (err) {
-              self.debug(err);
+          connection.release(function(err2) {
+            if (err2) {
+              self.debug(err2);
             }
+            if (self.settings.debug) {
+              self.debug('Connection released: ', self.pool);
+            }
+            callback(err || err2, data);
           });
-          if (self.settings.debug) {
-            self.debug('Connection released: ', self.pool);
-          }
-          callback(err ? err : null, data ? data : null);
         }
       });
   });

diff --git a/test/oracle.connectionpool.test.js b/test/oracle.connectionpool.test.js
@@ -37,7 +37,7 @@ describe('Oracle connector', function() {
     });
   });
 
-  it('should create connection pool ', function(done) {
+  it('should create connection pool with config', function(done) {
     config.minConn = 2;
     config.maxConn = 4;
     config.incrConn = 2;
@@ -68,4 +68,16 @@ describe('Oracle connector', function() {
       });
     });
   });
+
+  it('should close connection pool gracefully', function(done) {
+    db = new DataSource(require('../'), config);
+    db.connect(function() {
+      // Call ping to acquire/release a connection from the pool
+      db.ping(function(err) {
+        if (err) return done(err);
+        // It should disconnect gracefully
+        db.disconnect(done);
+      });
+    });
+  });
 });