From 2f3a9ee3bc756802f77bf5e33c0d84f33b357a31 Mon Sep 17 00:00:00 2001
From: roycalvo <roycalvo@gmail.com>
Date: Mon, 11 Jan 2021 21:42:36 +1100
Subject: [PATCH] Fixed logic on addDataType function to set non-string values
 on nested objects as non-string values

---
 .gitignore     |  4 +++-
 lib/helpers.js | 64 +++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index e33bd7e..c7e967c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,5 +57,7 @@ typings/
 # dotenv environment variables file
 .env
 
-example.js
+# vscode launch configuration
+.vscode
 
+example.js
diff --git a/lib/helpers.js b/lib/helpers.js
index 4d1e662..b6bbf43 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -5,6 +5,49 @@ const readline = require("readline"),
 
 let s3Metadata = null;
 
+let unflatten = function(data) {
+    "use strict";
+    if (Object(data) !== data || Array.isArray(data))
+        return data;
+    var regex = /\.?([^.\[\]]+)|\[(\d+)\]/g,
+        resultholder = {};
+    for (var p in data) {
+        var cur = resultholder,
+            prop = "",
+            m;
+        while (m = regex.exec(p)) {
+            cur = cur[prop] || (cur[prop] = (m[2] ? [] : {}));
+            prop = m[2] || m[1];
+        }
+        cur[prop] = data[p];
+    }
+    return resultholder[""] || resultholder;
+};
+
+let flatten = function(data) {
+    var result = {};
+    function recurse (cur, prop) {
+        if (Object(cur) !== cur) {
+            result[prop] = cur;
+        } else if (Array.isArray(cur)) {
+             for(var i=0, l=cur.length; i<l; i++)
+                 recurse(cur[i], prop + "[" + i + "]");
+            if (l == 0)
+                result[prop] = [];
+        } else {
+            var isEmpty = true;
+            for (var p in cur) {
+                isEmpty = false;
+                recurse(cur[p], prop ? prop+"."+p : p);
+            }
+            if (isEmpty && prop)
+                result[prop] = {};
+        }
+    }
+    recurse(data, "");
+    return result;
+}
+
 function startQueryExecution(query, config) {
     const QueryString = query.sql || query;
 
@@ -152,16 +195,18 @@ async function cleanUpDML(input, ignoreEmpty) {
 
 function addDataType(input, dataTypes) {
     let updatedObjectWithDataType = {};
-
-    for (const key in input) {
+    const flat = flatten(input)
+    for (const key in flat) {
         switch (dataTypes[key]) {
             case "varchar":
-                updatedObjectWithDataType[key] = input[key];
+                updatedObjectWithDataType[key] = flat[key];
                 break;
             case "boolean":
-                updatedObjectWithDataType[key] = JSON.parse(
-                    input[key].toLowerCase()
-                );
+                if (flat[key]) {
+                    updatedObjectWithDataType[key] = JSON.parse(
+                        flat[key].toLowerCase()
+                    );
+                }
                 break;
             case "integer":
             case "tinyint":
@@ -169,13 +214,14 @@ function addDataType(input, dataTypes) {
             case "int":
             case "float":
             case "double":
-                updatedObjectWithDataType[key] = Number(input[key]);
+                updatedObjectWithDataType[key] = Number(flat[key]);
                 break;
             default:
-                updatedObjectWithDataType[key] = input[key];
+                updatedObjectWithDataType[key] = flat[key];
         }
     }
-    return updatedObjectWithDataType;
+    const result = unflatten(updatedObjectWithDataType)
+    return result;
 }
 
 function cleanUpNonDML(input) {