From ea84dbbe1fd96e1bd4da9e71eb9ef710feec3178 Mon Sep 17 00:00:00 2001
From: Samrat Bandgar <samratbandgar@gmail.com>
Date: Wed, 6 Sep 2017 14:05:36 -0700
Subject: [PATCH] NIFI-4359

Based on field node type, whether value node or not, fetching the value of field.
---
 .../apache/nifi/processors/standard/ConvertJSONToSQL.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
index 00db3b56f8d8..ba6fedf3ad94 100755
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
@@ -37,6 +37,7 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
+import org.apache.commons.lang.StringEscapeUtils;
 
 import org.apache.nifi.annotation.behavior.InputRequirement;
 import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -508,7 +509,12 @@ private String generateInsert(final JsonNode rootNode, final Map<String, String>
      *
      */
     protected static String createSqlStringValue(final JsonNode fieldNode, final Integer colSize, final int sqlType) {
-        String fieldValue = fieldNode.asText();
+        String fieldValue;
+        if (fieldNode.isValueNode()) {
+            fieldValue = fieldNode.asText();
+        } else {
+            fieldValue = StringEscapeUtils.escapeSql(fieldNode.toString());
+        }
 
         switch (sqlType) {