Repository: nifi Updated Branches: refs/heads/master d75f118ae -> 62732cbb8
NIFI-4903 - Fixed timestamp bug with fetch processors using Oracle 12+ Signed-off-by: Pierre Villard <pierre.villard...@gmail.com> This closes #2488. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/62732cbb Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/62732cbb Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/62732cbb Branch: refs/heads/master Commit: 62732cbb8827d0e41dde90af325775a727501f45 Parents: d75f118 Author: Matthew Burgess <mattyb...@apache.org> Authored: Thu Feb 22 13:50:08 2018 -0500 Committer: Pierre Villard <pierre.villard...@gmail.com> Committed: Thu Feb 22 20:56:30 2018 +0100 ---------------------------------------------------------------------- .../nifi/processors/standard/AbstractDatabaseFetchProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/62732cbb/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractDatabaseFetchProcessor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractDatabaseFetchProcessor.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractDatabaseFetchProcessor.java index 2145929..15f9738 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractDatabaseFetchProcessor.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractDatabaseFetchProcessor.java @@ -446,7 +446,7 @@ public abstract class AbstractDatabaseFetchProcessor extends AbstractSessionFact case TIME: return "'" + value + "'"; case TIMESTAMP: - if ("Oracle".equals(databaseType)) { + if (!StringUtils.isEmpty(databaseType) && databaseType.contains("Oracle")) { // For backwards compatibility, the type might be TIMESTAMP but the state value is in DATE format. This should be a one-time occurrence as the next maximum value // should be stored as a full timestamp. Even so, check to see if the value is missing time-of-day information, and use the "date" coercion rather than the // "timestamp" coercion in that case
