fix: Reloading driver causes failures on async functions #514

Author: bimalkjha

lib/odbc.js

@@ -304,11 +304,13 @@ function Database(options)
   self.mode = options.mode || null;
   self.pool = options.pool || null;
   if( self.pool ) { // Its a pooled connection
+    if( !self.realClose ) {
       self.realClose = self.close;
       self.close = self.poolClose;
       self.realCloseSync = self.closeSync;
       self.closeSync = self.poolCloseSync;
-      self.connStr = options.connStr || null;
+    }
+    self.connStr = options.connStr || null;
   }
 } // Database()
 
@@ -1528,24 +1530,26 @@ Database.prototype.getInfo = function (infoType, infoLen, cb)
 } //getInfo
 
 //Proxy all of the ODBCStatement functions so that they are queued
-odbc.ODBCStatement.prototype._execute = odbc.ODBCStatement.prototype.execute;
-odbc.ODBCStatement.prototype._executeSync = odbc.ODBCStatement.prototype.executeSync;
-odbc.ODBCStatement.prototype._executeDirect = odbc.ODBCStatement.prototype.executeDirect;
-odbc.ODBCStatement.prototype._executeDirectSync = odbc.ODBCStatement.prototype.executeDirectSync;
-odbc.ODBCStatement.prototype._executeNonQuery = odbc.ODBCStatement.prototype.executeNonQuery;
-odbc.ODBCStatement.prototype._executeNonQuerySync = odbc.ODBCStatement.prototype.executeNonQuerySync;
-odbc.ODBCStatement.prototype._prepare = odbc.ODBCStatement.prototype.prepare;
-odbc.ODBCStatement.prototype._bind = odbc.ODBCStatement.prototype.bind;
-odbc.ODBCStatement.prototype._bindSync = odbc.ODBCStatement.prototype.bindSync;
-odbc.ODBCStatement.prototype._setAttr = odbc.ODBCStatement.prototype.setAttr;
-odbc.ODBCStatement.prototype._setAttrSync = odbc.ODBCStatement.prototype.setAttrSync;
-odbc.ODBCStatement.prototype._close = odbc.ODBCStatement.prototype.close;
-
-//Proxy all of the ODBCResult functions so that they are queued
-odbc.ODBCResult.prototype._fetch = odbc.ODBCResult.prototype.fetch;
-odbc.ODBCResult.prototype._fetchAll = odbc.ODBCResult.prototype.fetchAll;
-odbc.ODBCResult.prototype._getData = odbc.ODBCResult.prototype.getData;
-odbc.ODBCResult.prototype._close = odbc.ODBCResult.prototype.close;
+if( !odbc.ODBCStatement.prototype._execute ) { //issue #514
+  odbc.ODBCStatement.prototype._execute = odbc.ODBCStatement.prototype.execute;
+  odbc.ODBCStatement.prototype._executeSync = odbc.ODBCStatement.prototype.executeSync;
+  odbc.ODBCStatement.prototype._executeDirect = odbc.ODBCStatement.prototype.executeDirect;
+  odbc.ODBCStatement.prototype._executeDirectSync = odbc.ODBCStatement.prototype.executeDirectSync;
+  odbc.ODBCStatement.prototype._executeNonQuery = odbc.ODBCStatement.prototype.executeNonQuery;
+  odbc.ODBCStatement.prototype._executeNonQuerySync = odbc.ODBCStatement.prototype.executeNonQuerySync;
+  odbc.ODBCStatement.prototype._prepare = odbc.ODBCStatement.prototype.prepare;
+  odbc.ODBCStatement.prototype._bind = odbc.ODBCStatement.prototype.bind;
+  odbc.ODBCStatement.prototype._bindSync = odbc.ODBCStatement.prototype.bindSync;
+  odbc.ODBCStatement.prototype._setAttr = odbc.ODBCStatement.prototype.setAttr;
+  odbc.ODBCStatement.prototype._setAttrSync = odbc.ODBCStatement.prototype.setAttrSync;
+  odbc.ODBCStatement.prototype._close = odbc.ODBCStatement.prototype.close;
+
+  //Proxy all of the ODBCResult functions so that they are queued
+  odbc.ODBCResult.prototype._fetch = odbc.ODBCResult.prototype.fetch;
+  odbc.ODBCResult.prototype._fetchAll = odbc.ODBCResult.prototype.fetchAll;
+  odbc.ODBCResult.prototype._getData = odbc.ODBCResult.prototype.getData;
+  odbc.ODBCResult.prototype._close = odbc.ODBCResult.prototype.close;
+}
 
 odbc.ODBCStatement.prototype.execute = function (params, cb)
 {