Merge pull request #7 from txase/fixes

Fix handling of null numbers and timestamps

Author: txase

index.js

@@ -29,20 +29,22 @@ function hydrateRecord (record, fields) {
 
     value = getAuroraDataValue(value);
 
-    switch (field.typeName) {
-      case 'DECIMAL':
-        value = Number(value);
-        break;
-
-      case 'DATE':
-      case 'DATETIME':
-      case 'TIMESTAMP':
-      case 'YEAR':
-        value = new Date(value + 'Z');
-        break;
+    if (value !== null) {
+      switch (field.typeName) {
+        case 'DECIMAL':
+          value = Number(value);
+          break;
 
-      default:
-        break;
+        case 'DATE':
+        case 'DATETIME':
+        case 'TIMESTAMP':
+        case 'YEAR':
+          value = new Date(value + 'Z');
+          break;
+
+        default:
+          break;
+      }
     }
 
     row[field.label] = value;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex-aurora-data-api-mysql",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Knex.js driver for MySQL AWS Aurora Data API",
   "homepage": "https://github.com/txase/knex-aurora-data-api-mysql",
   "repository": "txase/knex-aurora-data-api-mysql",

tests/constants.js

@@ -197,6 +197,22 @@ module.exports = {
         type: 92,
         typeName: 'TIME'
       },
+      {
+        arrayBaseColumnType: 0,
+        isAutoIncrement: false,
+        isCaseSensitive: false,
+        isCurrency: false,
+        isSigned: false,
+        label: 'timestamp_null',
+        name: 'timestamp_null',
+        nullable: 1,
+        precision: 19,
+        scale: 0,
+        schemaName: '',
+        tableName: 'foo',
+        type: 93,
+        typeName: 'TIMESTAMP'
+      },
       {
         arrayBaseColumnType: 0,
         isAutoIncrement: false,
@@ -365,6 +381,9 @@ module.exports = {
         {
           stringValue: '04:31:56.734'
         },
+        {
+          isNull: true
+        },
         {
           stringValue: 'foo'
         },
@@ -421,6 +440,7 @@ module.exports = {
       datetime3: new Date('2020-04-16T15:36:54.384Z'),
       timestamp3: new Date('2020-04-16T03:21:45.938Z'),
       time3: '04:31:56.734',
+      timestamp_null: null,
       varchar: 'foo',
       varbinary: Buffer.from([98, 97, 114]),
       blob: Buffer.from([98, 108, 111, 103]),