feat(execute): Send bind parameter dates using MySQL DATETIME type, throw error when passing in undefined parameter

Author: gazoakley

lib/packets/execute.js

@@ -11,28 +11,25 @@ function Execute(id, parameters, charsetNumber) {
   this.encoding = CharsetToEncoding[charsetNumber];
 }
 
-var pad = '000000000000';
-function leftPad(num, value) {
-    var s = value.toString();
-    // if we don't need to pad
-    if (s.length >= num) {
-        return s;
-    }
-    return (pad + s).slice(-num);
-}
-
-function toMysqlDateTime(date) {
-  return [date.getFullYear(), date.getMonth() + 1, date.getDate()].join('-') +  ' ' +
-    [date.getHours(), date.getMinutes(), date.getSeconds()].join(':') + '.' +
-    leftPad(3, date.getMilliseconds());
-}
-
 function isJSON(value) {
   return Array.isArray(value) ||
     value.constructor === Object ||
     (typeof value.toJSON === 'function' && !Buffer.isBuffer(value));
 }
 
+function toMysqlDateBuffer(value) {
+  var bufferValue = Buffer.allocUnsafe(12);
+  bufferValue.writeUInt8(11, 0);
+  bufferValue.writeUInt16LE(value.getFullYear(), 1);
+  bufferValue.writeUInt8(value.getMonth() + 1, 3);
+  bufferValue.writeUInt8(value.getDate(), 4);
+  bufferValue.writeUInt8(value.getHours(), 5);
+  bufferValue.writeUInt8(value.getMinutes(), 6);
+  bufferValue.writeUInt8(value.getSeconds(), 7);
+  bufferValue.writeUInt32LE(value.getMilliseconds() * 1000, 8);
+  return bufferValue;
+}
+
 /**
  * Converts a value to an object describing type, String/Buffer representation and length
  * @param {*} value
@@ -43,6 +40,9 @@ function toParameter(value, encoding) {
   var fixed = false;
   if (value !== null) {
     switch (typeof value) {
+      case 'undefined':
+        throw new TypeError('Bind parameters must not contain undefined');
+
       case 'number':
         type = Types.DOUBLE;
         fixed = true;
@@ -61,7 +61,9 @@ function toParameter(value, encoding) {
 
       case 'object':
         if (Object.prototype.toString.call(value) == '[object Date]') {
-          value = toMysqlDateTime(value);
+          type = Types.DATETIME;
+          fixed = true;
+          value = toMysqlDateBuffer(value);
         } else if (isJSON(value)) {
           type = Types.JSON;
           value = JSON.stringify(value);

test/integration/connection/test-execute-bind-date.js

@@ -0,0 +1,19 @@
+var common = require('../../common');
+var connection = common.createConnection();
+var assert = require('assert');
+
+var date = new Date(2018, 02, 10, 15, 12, 34, 1234)
+
+var rows, fields;
+connection.execute('SELECT ? AS result', [date], function(err, _rows, _fields) {
+  if (err) {
+    throw err;
+  }
+  rows = _rows;
+  fields = _fields;
+  connection.end();
+});
+
+process.on('exit', function() {
+  assert.deepEqual(rows, [{ result: date }]);
+});

test/integration/connection/test-execute-bind-undefined.js

@@ -0,0 +1,18 @@
+var common = require('../../common');
+var connection = common.createConnection();
+var assert = require('assert');
+
+var error = null;
+var foo = {};
+
+connection.execute('SELECT ? AS result', [foo.bar], function(err, _rows) { });
+
+// TODO: Needs to be a better way of catching this exception
+process.on('uncaughtException', (err) => {
+  error = err;
+  process.exit(0);
+});
+
+process.on('exit', function() {
+  assert.equal(error.name, 'TypeError');
+});