From 58c97651e18f2880b5aa291a1e41b2ab7e14b0f1 Mon Sep 17 00:00:00 2001
From: Matt Burgess <mattyb149@apache.org>
Date: Thu, 13 Oct 2016 13:27:49 -0400
Subject: [PATCH] NIFI-2897: Fixed SelectHiveQL for CSV output of complex types

---
 .../java/org/apache/nifi/util/hive/HiveJdbcCommon.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java
index d4b2945d5302..689baf941d8a 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java
@@ -339,6 +339,16 @@ public static long convertToCsvStream(final ResultSet rs, final OutputStream out
                             rowValues.add("");
                         }
                         break;
+                    case ARRAY:
+                    case STRUCT:
+                    case JAVA_OBJECT:
+                        String complexValueString = rs.getString(i);
+                        if (complexValueString != null) {
+                            rowValues.add(StringEscapeUtils.escapeCsv(complexValueString));
+                        } else {
+                            rowValues.add("");
+                        }
+                        break;
                     default:
                         if (value != null) {
                             rowValues.add(value.toString());