Merge pull request #660 from vasyas/master

Milliseconds for setting date values

Author: sidorares

lib/compile_binary_parser.js

@@ -136,7 +136,7 @@ function readCodeFor(field, config, options, fieldNum) {
     case Types.TIMESTAMP:
     case Types.NEWDATE:
       if (config.dateStrings) {
-        return 'packet.readDateTimeString();';
+        return 'packet.readDateTimeString(' + field.decimals + ');';
       }
       return 'packet.readDateTime();';
     case Types.TIME:

lib/packets/execute.js

@@ -11,6 +11,16 @@ 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);
+}
+
 Execute.prototype.toPacket = function() {
   // TODO: don't try to calculate packet length in advance, allocate some big buffer in advance (header + 256 bytes?)
   // and copy + reallocate if not enough
@@ -36,7 +46,9 @@ Execute.prototype.toPacket = function() {
           this.parameters[i] =
             [d.getFullYear(), d.getMonth() + 1, d.getDate()].join('-') +
             ' ' +
-            [d.getHours(), d.getMinutes(), d.getSeconds()].join(':');
+            [d.getHours(), d.getMinutes(), d.getSeconds()].join(':') +
+            '.' + leftPad(3, d.getMilliseconds())
+          ;
         }
         if (Buffer.isBuffer(this.parameters[i])) {
           length += Packet.lengthCodedNumberLength(this.parameters[i].length);

lib/packets/packet.js

@@ -273,7 +273,7 @@ function leftPad(num, value) {
   return (pad + s).slice(-num);
 }
 
-Packet.prototype.readDateTimeString = function() {
+Packet.prototype.readDateTimeString = function(decimals) {
   var length = this.readInt8();
   var y = 0;
   var m = 0;
@@ -298,6 +298,15 @@ Packet.prototype.readDateTimeString = function() {
   if (length > 10) {
     ms = this.readInt32();
     str += '.';
+
+    if (decimals) {
+      ms = leftPad(6, ms);
+
+      if (ms.length > decimals) {
+        ms = ms.substring(0, decimals); // rounding is done at the MySQL side, only 0 are here
+      }
+    }
+
     str += ms;
   }
   return str;

test/integration/connection/test-datetime.js

@@ -3,33 +3,41 @@ var connection = common.createConnection();
 var connection1 = common.createConnection({ dateStrings: true });
 var assert = require('assert');
 
-var rows, rows1, rows2, rows3, rows4, rows5;
+var rows, rows1, rows2, rows3, rows4, rows5, rows6;
 
 var date = new Date('1990-01-01 08:15:11 UTC');
+var datetime = new Date('2010-12-10 14:12:09.019473');
+
 var date1 = new Date('2000-03-03 08:15:11 UTC');
 var date2 = '2010-12-10 14:12:09.019473';
 var date3 = null;
+var date4 = '2010-12-10 14:12:09.123456';
+var date5 = '2010-12-10 14:12:09.019';
 
-connection.query('CREATE TEMPORARY TABLE t (d1 DATE)');
+connection.query('CREATE TEMPORARY TABLE t (d1 DATE, d2 DATETIME(3), d3 DATETIME(6))');
 connection.query("set time_zone = '+00:00'");
-connection.query('INSERT INTO t set d1=?', [date]);
+connection.query('INSERT INTO t set d1=?, d2=?, d3=?', [ date, datetime, datetime ]);
 
 connection1.query(
-  'CREATE TEMPORARY TABLE t (d1 DATE, d2 TIMESTAMP, d3 DATETIME, d4 DATETIME)'
+  'CREATE TEMPORARY TABLE t (d1 DATE, d2 TIMESTAMP, d3 DATETIME, d4 DATETIME, d5 DATETIME(6), d6 DATETIME(3))'
 );
-connection1.query('INSERT INTO t set d1=?, d2=?, d3=?, d4=?', [
+connection1.query('INSERT INTO t set d1=?, d2=?, d3=?, d4=?, d5=?, d6=?', [
   date,
   date1,
   date2,
-  date3
+  date3,
+  date4,
+  date5
 ]);
 
 var dateAsStringExpected = [
   {
     d1: '1990-01-01',
     d2: '2000-03-03 08:15:11',
     d3: '2010-12-10 14:12:09',
-    d4: null
+    d4: null,
+    d5: '2010-12-10 14:12:09.123456',
+    d6: '2010-12-10 14:12:09.019'
   }
 ];
 
@@ -77,11 +85,19 @@ connection1.query('select * from t', function(err, _rows, _fields) {
   rows4 = _rows;
 });
 
+
 connection1.execute('select * from t', function(err, _rows, _fields) {
   if (err) {
     throw err;
   }
   rows5 = _rows;
+});
+
+connection1.execute('select * from t where d6 = ?', [ new Date(date5) ],  function(err, _rows, _fields) {
+  if (err) {
+    throw err;
+  }
+  rows6 = _rows;
   connection1.end();
 });
 
@@ -99,8 +115,15 @@ process.on('exit', function() {
   );
 
   assert.equal(rows2[0].d1.getDate(), date.getDate());
+  assert.equal(rows2[0].d2.getTime(), datetime.getTime());
+  assert.equal(rows2[0].d3.getTime(), datetime.getTime());
+
   assert.equal(rows3[0].d1.getDate(), date.getDate());
+  assert.equal(rows3[0].d2.getTime(), datetime.getTime());
+  assert.equal(rows3[0].d3.getTime(), datetime.getTime());
 
   assert.deepEqual(rows4, dateAsStringExpected);
   assert.deepEqual(rows5, dateAsStringExpected);
+
+  assert.equal(rows6.length, 1);
 });

test/integration/regressions/test-#617.js

@@ -16,7 +16,7 @@ var expected = [
   },
   {
     id: 2,
-    date: '2017-07-26 09:36:42.123000',
+    date: '2017-07-26 09:36:42.123',
     name: 'Jane'
   }
 ];