Merge pull request #1295 from apancutt/master

Expose SQL query in errors

Author: sidorares

lib/commands/command.js

@@ -26,6 +26,7 @@ class Command extends EventEmitter {
     }
     if (packet && packet.isError()) {
       const err = packet.asError(connection.clientEncoding);
+      err.sql = this.sql || this.query;
       if (this.onResult) {
         this.onResult(err);
         this.emit('end');

promise.js

@@ -9,6 +9,7 @@ function makeDoneCb(resolve, reject, localErr) {
       localErr.message = err.message;
       localErr.code = err.code;
       localErr.errno = err.errno;
+      localErr.sql = err.sql;
       localErr.sqlState = err.sqlState;
       localErr.sqlMessage = err.sqlMessage;
       reject(localErr);

test/integration/connection/test-errors.js

@@ -15,6 +15,7 @@ connection
   .execute('error in execute', [], err => {
     assert.equal(err.errno, 1064);
     assert.equal(err.code, 'ER_PARSE_ERROR');
+    assert.equal(err.sql, 'error in execute');
     if (err) {
       onExecuteResultError = true;
     }
@@ -26,6 +27,7 @@ connection
   .query('error in query', [], err => {
     assert.equal(err.errno, 1064);
     assert.equal(err.code, 'ER_PARSE_ERROR');
+    assert.equal(err.sql, 'error in query');
     if (err) {
       onQueryResultError = true;
     }