From 501cbfc98ea9ef3a1d543579ea1c2f3a1bf44bc5 Mon Sep 17 00:00:00 2001
From: Jiri Pechanec <jpechane@redhat.com>
Date: Thu, 10 Jan 2019 10:25:38 +0100
Subject: [PATCH] DBZ-1064 Set default value only for non-nullable fields

---
 .../io/debezium/connector/oracle/OracleValueConverters.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/OracleValueConverters.java b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/OracleValueConverters.java
index e8cd7572f..e9d88a09f 100644
--- a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/OracleValueConverters.java
+++ b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/OracleValueConverters.java
@@ -311,7 +311,7 @@ protected Object convertNumericAsBigInteger(Column column, Field fieldDefn, Obje
 
     @Override
     protected Object convertTinyInt(Column column, Field fieldDefn, Object data) {
-        if (data == null) {
+        if (data == null && !fieldDefn.schema().isOptional()) {
             data = fieldDefn.schema().defaultValue();
         }
         if (data == null) {
@@ -398,7 +398,7 @@ protected Object convertTimestampWithZone(Column column, Field fieldDefn, Object
     }
 
     protected Object convertIntervalYearMonth(Column column, Field fieldDefn, Object data) {
-        if (data == null) {
+        if (data == null && !fieldDefn.schema().isOptional()) {
             data = fieldDefn.schema().defaultValue();
         }
         if (data == null) {
@@ -430,7 +430,7 @@ protected Object convertIntervalYearMonth(Column column, Field fieldDefn, Object
     }
 
     protected Object convertIntervalDaySecond(Column column, Field fieldDefn, Object data) {
-        if (data == null) {
+        if (data == null && !fieldDefn.schema().isOptional()) {
             data = fieldDefn.schema().defaultValue();
         }
         if (data == null) {