Merge pull request #681 from sidorares/null-buffer

Add support for NULL to readLengthCodedBuffer. Fixes #668

Author: sidorares

lib/packets/packet.js

@@ -117,8 +117,7 @@ Packet.prototype.readInt64 = function() {
   var word0 = this.readInt32();
   var word1 = this.readInt32();
   var res = new Long(word0, word1, true);
-  var resNumber = res.toNumber(),
-    resString = res.toString();
+  var resNumber = res.toNumber(), resString = res.toString();
 
   res = resNumber.toString() === resString ? resNumber : resString;
 
@@ -129,8 +128,7 @@ Packet.prototype.readSInt64 = function() {
   var word0 = this.readInt32();
   var word1 = this.readInt32();
   var res = new Long(word0, word1, false);
-  var resNumber = res.toNumber(),
-    resString = res.toString();
+  var resNumber = res.toNumber(), resString = res.toString();
 
   res = resNumber.toString() === resString ? resNumber : resString;
 
@@ -196,8 +194,7 @@ Packet.prototype.readLengthCodedNumberExt = function(
 
     res = new Long(word0, word1, !signed); // Long need unsigned
 
-    var resNumber = res.toNumber(),
-      resString = res.toString();
+    var resNumber = res.toNumber(), resString = res.toString();
 
     res = resNumber.toString() === resString ? resNumber : resString;
 
@@ -369,6 +366,9 @@ Packet.prototype.readLengthCodedString = function(encoding) {
 
 Packet.prototype.readLengthCodedBuffer = function() {
   var len = this.readLengthCodedNumber();
+  if (len === null) {
+    return null;
+  }
   return this.readBuffer(len);
 };
 

test/integration/connection/test-null-buffer.js

@@ -0,0 +1,32 @@
+var common = require('../../common');
+var connection = common.createConnection();
+var assert = require('assert');
+
+var rowsTextProtocol;
+var rowsBinaryProtocol;
+
+connection.query('CREATE TEMPORARY TABLE binary_table (stuff BINARY(16));');
+connection.query('INSERT INTO binary_table VALUES(null)');
+
+connection.query('SELECT * from binary_table', function(err, _rows) {
+  if (err) {
+    throw err;
+  }
+  rowsTextProtocol = _rows;
+  connection.execute('SELECT * from binary_table', function(
+    err,
+    _rows,
+    _fields
+  ) {
+    if (err) {
+      throw err;
+    }
+    rowsBinaryProtocol = _rows;
+    connection.end();
+  });
+});
+
+process.on('exit', function() {
+  assert.deepEqual(rowsTextProtocol[0], { stuff: null });
+  assert.deepEqual(rowsBinaryProtocol[0], { stuff: null });
+});