Add ErrorPackets for multi result

mysqljs · May 12, 2012 · a0542e4 · a0542e4
1 parent f5bd13d
commit a0542e4
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/lib/protocol/sequences/Query.js b/lib/protocol/sequences/Query.js
@@ -48,6 +48,16 @@ Query.prototype['OkPacket'] = function(packet) {
   this._handleFinalResultPacket(packet);
 };
 
+Query.prototype['ErrorPacket'] = function(packet) {
+  var err = Sequence.packetToError(packet);
+
+  var results = (this._results.length > 0)
+    ? this._results
+    : undefined;
+
+  this.end(err, results);
+};
+
 Query.prototype['ResultSetHeaderPacket'] = function(packet) {
   this._resultSet = new ResultSet(packet);
 };

diff --git a/test/integration/test-multiple-statements-with-error.js b/test/integration/test-multiple-statements-with-error.js
@@ -0,0 +1,33 @@
+var common     = require('../common');
+var connection = common.createConnection();
+var assert     = require('assert');
+
+var sql = [
+  'SELECT 1',
+  'invalid sql',
+  'SELECT 2',
+].join('; ');
+
+var finishedQueryOne = false;
+connection.query(sql, function(err, results) {
+  assert.equal(finishedQueryOne, false);
+  finishedQueryOne = true;
+
+  assert.equal(err.code, 'ER_PARSE_ERROR');
+  assert.deepEqual(results, [[{1: 1}]]);
+});
+
+var finishedQueryTwo = false;
+connection.query('SELECT 3', function(err, results) {
+  assert.equal(finishedQueryTwo, false);
+  finishedQueryTwo = true;
+
+  assert.deepEqual(results, [{3: 3}]);
+});
+
+connection.end();
+
+process.on('exit', function() {
+  assert.equal(finishedQueryOne, true);
+  assert.equal(finishedQueryTwo, true);
+});