Fixed TIMESTAMP and TIME truncation

lib/protocol/Writer.js

@@ -33,8 +33,8 @@ exports = module.exports = Writer;
 
 var REGEX = {
   DATE: /(\d{4})-(\d{2})-(\d{2})/,
-  TIME: /(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/,
-  TIMESTAMP: /(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/,
+  TIME: /(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?/,
+  TIMESTAMP: /(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?/,
   // DECIMAL will match "" and ".", both of which are invalid, requires an
   // additional check
   DECIMAL: /^([+-])?(\d*)(?:\.(\d*))?(?:[eE]([+-]?\d+))?$/
@@ -728,7 +728,8 @@ Writer.prototype[TypeCode.TIME] = function writeTime(value) {
     }
     hours = ~~time[1];
     minutes = ~~time[2];
-    milliseconds = Math.round(time[3] * 1000);
+    var decMilli = strToNumLen(time[4], 3);
+    milliseconds = time[3] * 1000 + decMilli;
   } else {
     throw createInputError('TIME');
   }
@@ -776,7 +777,8 @@ Writer.prototype[TypeCode.TIMESTAMP] = function writeTimestamp(value) {
     day = ~~ts[3];
     hours = ~~ts[4];
     minutes = ~~ts[5];
-    milliseconds = Math.round(ts[6] * 1000);
+    var decMilli = strToNumLen(ts[7], 3);
+    milliseconds = ts[6] * 1000 + decMilli;
   } else {
     throw createInputError('TIMESTAMP');
   }
@@ -861,7 +863,7 @@ Writer.prototype[TypeCode.LONGDATE] = function writeLongDate(value) {
     hours = ~~ts[4];
     minutes = ~~ts[5];
     seconds = ~~ts[6];
-    nanoseconds = ~~((ts[6] * 1000000000) % 1000000000);
+    nanoseconds = strToNumLen(ts[7], 9);
   } else {
     throw createInputError('LONGDATE');
   }
@@ -1105,6 +1107,14 @@ function truncateDecimalToExp(decimal, minExp) {
   };
 }
 
+// Truncates / pads a decimal string to get a fixed number of decimal places as an integer
+function strToNumLen(str, len) {
+  if (str === undefined) {
+    return 0;
+  }
+  return Number(str.length > len ? str.substring(0, len) : str + util.ZEROS[len - str.length]);
+}
+
 function createInputError(type) {
   return new Error(util.format('Wrong input for %s type', type));
 }