fix: unhandledRejection error, issue #996

Author: bimalkjha

lib/odbc.js

@@ -661,24 +661,35 @@ Database.prototype.query = function (query, params, cb)
  sql = query;
  }
  exports.debug && console.log(getElapsedTime(), "odbc.js:query() => ", sql);
- if (params && params.length > 0)
- {
- if(Array.isArray(params))
+
+ try {
+ if (params && params.length > 0)
  {
- var err = parseParams(params);
- if(err) deferred ? deferred.reject(err) : cb(err);
+ if(Array.isArray(params))
+ {
+ var err = parseParams(params);
+ if(err) deferred ? deferred.reject(err) : cb(err);
+ }
+ if(exports.debug && logParams) {
+ console.log("%s odbc.js:query() params = ", getElapsedTime(), params);
+ }
+ if(typeof query === 'object')
+ {
+ query.params = params;
+ self.conn.query(query, cbQuery);
+ }
+ else
+ self.conn.query(query, params, cbQuery);
  }
- if(typeof query === 'object')
+ else
  {
- query.params = params;
  self.conn.query(query, cbQuery);
  }
- else
- self.conn.query(query, params, cbQuery);
- }
- else
+ } catch (err)
  {
- self.conn.query(query, cbQuery);
+ self.checkConnectionError(err);
+ deferred ? deferred.reject(err) : cb(err);
+ return next();
  }
  }); //self.queue.push
  return deferred ? deferred.promise : false;

src/odbc_connection.cpp

@@ -1064,6 +1064,8 @@ NAN_METHOD(ODBCConnection::Query)
  GETCPPSTR2(data->sql, sql3, len, errmsg);
  }
 
+ Nan::TryCatch try_catch;
+
  Local<String> optionParamsKey = Nan::New(OPTION_PARAMS);
  if (Nan::HasOwnProperty(obj, optionParamsKey).IsJust() && Nan::Get(obj, optionParamsKey).ToLocalChecked()->IsArray())
  {
@@ -1076,6 +1078,13 @@ NAN_METHOD(ODBCConnection::Query)
  data->paramCount = 0;
  }
 
+ if (try_catch.HasCaught())
+ {
+ free(data);
+ try_catch.ReThrow();
+ return;
+ }
+
  Local<String> optionNoResultsKey = Nan::New(OPTION_NORESULTS);
  if (Nan::HasOwnProperty(obj, optionNoResultsKey).IsJust() && Nan::Get(obj, optionNoResultsKey).ToLocalChecked()->IsBoolean())
  {

test/test-asyc-await.js renamed to test/test-async-await.js

@@ -5,6 +5,10 @@ var common = require("./common")
  , cn = common.connectionString
  ;
 
+process.on('unhandledRejection', async (reason, p) => {
+ console.debug('Unhandled Error: ', reason, p)
+});
+
 main();
 async function main() {
  await test1();