Make sure querystream "close" event is the last event emitted

Author: Christopher Jones

examples/refcursortoquerystream.js

@@ -71,7 +71,7 @@ oracledb.getConnection(
           doRelease(connection);
         });
 
-        queryStream.on('end', function () {
+        queryStream.on('close', function () {
           doRelease(connection);
         });
       }

examples/resultsettoquerystream.js

@@ -64,7 +64,7 @@ oracledb.getConnection(
           doRelease(connection);
         });
 
-        queryStream.on('end', function() {
+        queryStream.on('close', function() {
           doRelease(connection);
         });
       }

lib/querystream.js

@@ -64,6 +64,14 @@ function QueryStream(resultSet, oracledb) {
       }
     });
   }
+
+  self.on('end', function() {
+    // Using setImmediate to ensure that end event handlers are processed
+    // before the destroy logic is invoked.
+    setImmediate(function() {
+      self.destroy();
+    });
+  });
 }
 
 util.inherits(QueryStream, Readable);
@@ -143,24 +151,9 @@ QueryStream.prototype._read = function() {
     if (row) {
       self.push(row);
     } else {
-      self._close(function(err) {
-        if (err) {
-          self.emit('error', err);
-
-          return;
-        }
-
-        // Pushing null will signal the end of the stream and emit the 'end'
-        // event. This is done in the _close callback to ensure that no errors
-        // will occur after the 'end' event.
-        self.push(null);
-
-        // Using setImmediate to ensure that the 'end' event is emitted before
-        // 'close'.
-        setImmediate(function() {
-          self.emit('close');
-        });
-      });
+      // Pushing null will signal the end of the stream. The 'end' event will
+      // be emitted when the streams internal buffer is flushed out.
+      self.push(null);
     }
   });
 };