Repository: nifi Updated Branches: refs/heads/master 19e53962c -> a7e6820fd
NIFI-1596: ExecuteSQL Error Creating Schema Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a7e6820f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a7e6820f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a7e6820f Branch: refs/heads/master Commit: a7e6820fd983ee0211a8d273815bacc3dab39e49 Parents: 19e5396 Author: Matt Burgess <[email protected]> Authored: Mon Mar 7 09:10:05 2016 -0500 Committer: Matt Burgess <[email protected]> Committed: Mon Mar 7 10:42:21 2016 -0500 ---------------------------------------------------------------------- .../processors/standard/util/JdbcCommon.java | 2 +- .../processors/standard/util/TestJdbcCommon.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/a7e6820f/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 ece131f..1247919 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 @@ -130,7 +130,7 @@ public class JdbcCommon { String tableName = "NiFi_ExecuteSQL_Record"; if(nrOfColumns > 0) { String tableNameFromMeta = meta.getTableName(1); - if (!StringUtils.isBlank(tableName)) { + if (!StringUtils.isBlank(tableNameFromMeta)) { tableName = tableNameFromMeta; } } http://git-wip-us.apache.org/repos/asf/nifi/blob/a7e6820f/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 6e0eb40..da9e163 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 @@ -124,6 +124,25 @@ public class TestJdbcCommon { } @Test + public void testCreateSchemaNoTableName() throws ClassNotFoundException, SQLException { + + final ResultSet resultSet = mock(ResultSet.class); + final ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class); + when(resultSet.getMetaData()).thenReturn(resultSetMetaData); + when(resultSetMetaData.getColumnCount()).thenReturn(1); + when(resultSetMetaData.getTableName(1)).thenReturn(""); + when(resultSetMetaData.getColumnType(1)).thenReturn(Types.INTEGER); + when(resultSetMetaData.getColumnName(1)).thenReturn("ID"); + + final Schema schema = JdbcCommon.createSchema(resultSet); + assertNotNull(schema); + + // records name, should be result set first column table name + assertEquals("NiFi_ExecuteSQL_Record", schema.getName()); + + } + + @Test public void testConvertToBytes() throws ClassNotFoundException, SQLException, IOException { // remove previous test database, if any folder.delete();
