guard for self.activeQuery

Author: calvinmetcalf

lib/client.js

@@ -236,43 +236,67 @@ Client.prototype._attachListeners = function (con) {
   const self = this
   // delegate rowDescription to active query
   con.on('rowDescription', function (msg) {
+    if (!self.activeQuery) {
+      return
+    }
     self.activeQuery.handleRowDescription(msg)
   })
 
   // delegate dataRow to active query
   con.on('dataRow', function (msg) {
+    if (!self.activeQuery) {
+      return
+    }
     self.activeQuery.handleDataRow(msg)
   })
 
   // delegate portalSuspended to active query
   con.on('portalSuspended', function (msg) {
+    if (!self.activeQuery) {
+      return
+    }
     self.activeQuery.handlePortalSuspended(con)
   })
 
   // deletagate emptyQuery to active query
   con.on('emptyQuery', function (msg) {
+    if (!self.activeQuery) {
+      return
+    }
     self.activeQuery.handleEmptyQuery(con)
   })
 
   // delegate commandComplete to active query
   con.on('commandComplete', function (msg) {
+    if (!self.activeQuery) {
+      return
+    }
     self.activeQuery.handleCommandComplete(msg, con)
   })
 
   // if a prepared statement has a name and properly parses
   // we track that its already been executed so we don't parse
   // it again on the same client
   con.on('parseComplete', function (msg) {
+    if (!self.activeQuery) {
+      return
+    }
     if (self.activeQuery.name) {
       con.parsedStatements[self.activeQuery.name] = true
     }
   })
 
   con.on('copyInResponse', function (msg) {
+    if (!self.activeQuery) {
+      return
+    }
     self.activeQuery.handleCopyInResponse(self.connection)
   })
 
   con.on('copyData', function (msg) {
+    if (!self.activeQuery) {
+      return
+    }
     self.activeQuery.handleCopyData(msg, self.connection)
   })