You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/10/23 20:39:54 UTC
[1/2] nifi git commit: NIFI-1010: If database driver does not support
getting table name for column from ResultSetMetadata,
then just use a default name
Repository: nifi
Updated Branches:
refs/heads/master 0fc5d3046 -> d63cd6bd2
NIFI-1010: If database driver does not support getting table name for column from ResultSetMetadata, then just use a default name
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/88fc8d28
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/88fc8d28
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/88fc8d28
Branch: refs/heads/master
Commit: 88fc8d28a0502fa7d66662d6646f31cf33e131be
Parents: 22924c6
Author: Mark Payne <ma...@hotmail.com>
Authored: Sun Oct 18 22:57:04 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Oct 23 10:25:59 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/processors/standard/util/JdbcCommon.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/88fc8d28/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 6fc69ff..753513b 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
@@ -51,6 +51,7 @@ import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericDatumWriter;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.io.DatumWriter;
+import org.apache.commons.lang3.StringUtils;
/**
* JDBC / SQL common functions.
@@ -95,7 +96,10 @@ public class JdbcCommon {
public static Schema createSchema(final ResultSet rs) throws SQLException {
final ResultSetMetaData meta = rs.getMetaData();
final int nrOfColumns = meta.getColumnCount();
- final String tableName = meta.getTableName(1);
+ String tableName = meta.getTableName(1);
+ if (StringUtils.isBlank(tableName)) {
+ tableName = "NiFi_ExecuteSQL_Record";
+ }
final FieldAssembler<Schema> builder = SchemaBuilder.record(tableName).namespace("any.data").fields();
[2/2] nifi git commit: Merge branch 'NIFI-1010'
Posted by ma...@apache.org.
Merge branch 'NIFI-1010'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d63cd6bd
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d63cd6bd
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d63cd6bd
Branch: refs/heads/master
Commit: d63cd6bd2f9adc3dfc4c7fe168e38081a5b13564
Parents: 0fc5d30 88fc8d2
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Oct 23 14:39:16 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Oct 23 14:39:16 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/processors/standard/util/JdbcCommon.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/d63cd6bd/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java
----------------------------------------------------------------------