You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2018/01/04 20:21:04 UTC
nifi git commit: NIFI-4738: Fixed logic bug in JdbcCommon for 9-digit
unsigned ints. This closes #2373
Repository: nifi
Updated Branches:
refs/heads/master 99d767aa4 -> ce4374ee0
NIFI-4738: Fixed logic bug in JdbcCommon for 9-digit unsigned ints. This closes #2373
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ce4374ee
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ce4374ee
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ce4374ee
Branch: refs/heads/master
Commit: ce4374ee0017708252e955ac94d34b61c481a1ce
Parents: 99d767a
Author: Matthew Burgess <ma...@apache.org>
Authored: Thu Jan 4 14:30:47 2018 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Jan 4 15:20:35 2018 -0500
----------------------------------------------------------------------
.../processors/standard/util/JdbcCommon.java | 2 +-
.../standard/util/TestJdbcCommon.java | 35 ++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/ce4374ee/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java
index fd8f71e..1a3714c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java
@@ -494,7 +494,7 @@ public class JdbcCommon {
break;
case INTEGER:
- if (meta.isSigned(i) || (meta.getPrecision(i) > 0 && meta.getPrecision(i) <= MAX_DIGITS_IN_INT)) {
+ if (meta.isSigned(i) || (meta.getPrecision(i) > 0 && meta.getPrecision(i) < MAX_DIGITS_IN_INT)) {
builder.name(columnName).type().unionOf().nullBuilder().endNull().and().intType().endUnion().noDefault();
} else {
builder.name(columnName).type().unionOf().nullBuilder().endNull().and().longType().endUnion().noDefault();
http://git-wip-us.apache.org/repos/asf/nifi/blob/ce4374ee/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java
index 830567c..afe7788 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java
@@ -363,6 +363,41 @@ public class TestJdbcCommon {
assertTrue(foundNullSchema);
}
+ @Test
+ public void testInt9ShouldBeLong() throws SQLException, IllegalArgumentException, IllegalAccessException {
+ final ResultSetMetaData metadata = mock(ResultSetMetaData.class);
+ when(metadata.getColumnCount()).thenReturn(1);
+ when(metadata.getColumnType(1)).thenReturn(Types.INTEGER);
+ when(metadata.getPrecision(1)).thenReturn(9);
+ when(metadata.isSigned(1)).thenReturn(false);
+ when(metadata.getColumnName(1)).thenReturn("Col1");
+ when(metadata.getTableName(1)).thenReturn("Table1");
+
+ final ResultSet rs = mock(ResultSet.class);
+ when(rs.getMetaData()).thenReturn(metadata);
+
+ Schema schema = JdbcCommon.createSchema(rs);
+ Assert.assertNotNull(schema);
+
+ Schema.Field field = schema.getField("Col1");
+ Schema fieldSchema = field.schema();
+ Assert.assertEquals(2, fieldSchema.getTypes().size());
+
+ boolean foundLongSchema = false;
+ boolean foundNullSchema = false;
+
+ for (Schema type : fieldSchema.getTypes()) {
+ if (type.getType().equals(Schema.Type.LONG)) {
+ foundLongSchema = true;
+ } else if (type.getType().equals(Schema.Type.NULL)) {
+ foundNullSchema = true;
+ }
+ }
+
+ assertTrue(foundLongSchema);
+ assertTrue(foundNullSchema);
+ }
+
@Test
public void testConvertToAvroStreamForBigDecimal() throws SQLException, IOException {