You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2016/08/15 18:18:18 UTC

nifi git commit: NIFI-2356 ConvertJSONToSQL assumes IS_AUTOINCREMENT

Repository: nifi
Updated Branches:
  refs/heads/master fa5da543e -> 44057f097


NIFI-2356 ConvertJSONToSQL assumes IS_AUTOINCREMENT

This closes #862.

Signed-off-by: Bryan Bende <bb...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/44057f09
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/44057f09
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/44057f09

Branch: refs/heads/master
Commit: 44057f097a00771e405e075de5c1d9f57ef34958
Parents: fa5da54
Author: Peter Wicks <PW...@MICRON.COM>
Authored: Mon Aug 15 10:49:37 2016 -0600
Committer: Bryan Bende <bb...@apache.org>
Committed: Mon Aug 15 14:17:16 2016 -0400

----------------------------------------------------------------------
 .../nifi/processors/standard/ConvertJSONToSQL.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/44057f09/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
----------------------------------------------------------------------
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 cbc301a..194aa19 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
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -668,6 +669,13 @@ public class ConvertJSONToSQL extends AbstractProcessor {
         }
 
         public static ColumnDescription from(final ResultSet resultSet) throws SQLException {
+            final ResultSetMetaData md = resultSet.getMetaData();
+            List<String> columns = new ArrayList<>();
+
+            for (int i = 1; i < md.getColumnCount() + 1; i++) {
+                columns.add(md.getColumnName(i));
+            }
+
             final String columnName = resultSet.getString("COLUMN_NAME");
             final int dataType = resultSet.getInt("DATA_TYPE");
             final int colSize = resultSet.getInt("COLUMN_SIZE");
@@ -675,7 +683,12 @@ public class ConvertJSONToSQL extends AbstractProcessor {
             final String nullableValue = resultSet.getString("IS_NULLABLE");
             final boolean isNullable = "YES".equalsIgnoreCase(nullableValue) || nullableValue.isEmpty();
             final String defaultValue = resultSet.getString("COLUMN_DEF");
-            final String autoIncrementValue = resultSet.getString("IS_AUTOINCREMENT");
+            String autoIncrementValue = "NO";
+
+            if(columns.contains("IS_AUTOINCREMENT")){
+                autoIncrementValue = resultSet.getString("IS_AUTOINCREMENT");
+            }
+
             final boolean isAutoIncrement = "YES".equalsIgnoreCase(autoIncrementValue);
             final boolean required = !isNullable && !isAutoIncrement && defaultValue == null;