Add hidden treatTimestampLTZAsTimestamp

Author: vikasrathee-cs

oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleConnector.java

@@ -115,7 +115,7 @@ protected DBConnectorPath getDBConnectorPath(String path) {
   protected SchemaReader getSchemaReader(String sessionID) {
     return new OracleSourceSchemaReader(sessionID, config.getTreatAsOldTimestamp(),
                                         config.getTreatPrecisionlessNumAsDeci(),
-                                        config.getTreatAsTimestampForLocalTimeZone());
+                                        config.getTreatTimestampLTZAsTimestamp());
   }
 
   @Override

oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleConnectorConfig.java

@@ -49,7 +49,7 @@ public OracleConnectorConfig(String host, int port, String user, String password
                                String connectionArguments, String connectionType, String database,
                                String role, Boolean useSSL, @Nullable Boolean treatAsOldTimestamp,
                                @Nullable Boolean treatPrecisionlessNumAsDeci,
-                               @Nullable Boolean treatAsTimestampForLocalTimeZone) {
+                               @Nullable Boolean treatTimestampLTZAsTimestamp) {
 
     this.host = host;
     this.port = port;
@@ -63,7 +63,7 @@ public OracleConnectorConfig(String host, int port, String user, String password
     this.useSSL = useSSL;
     this.treatAsOldTimestamp = treatAsOldTimestamp;
     this.treatPrecisionlessNumAsDeci = treatPrecisionlessNumAsDeci;
-    this.treatAsTimestampForLocalTimeZone = treatAsTimestampForLocalTimeZone;
+    this.treatTimestampLTZAsTimestamp = treatTimestampLTZAsTimestamp;
   }
 
   @Override
@@ -100,10 +100,10 @@ public String getConnectionString() {
   @Nullable
   public Boolean treatPrecisionlessNumAsDeci;
 
-  @Name(OracleConstants.TREAT_AS_TIMESTAMP_FOR_LOCAL_TIME_ZONE)
+  @Name(OracleConstants.TREAT_TIMESTAMP_LTZ_AS_TIMESTAMP)
   @Description("A hidden field to handle mapping of Oracle Timestamp_LTZ data type to BQ Timestamp.")
   @Nullable
-  public Boolean treatAsTimestampForLocalTimeZone;
+  public Boolean treatTimestampLTZAsTimestamp;
 
   @Override
   protected int getDefaultPort() {
@@ -135,8 +135,8 @@ public Boolean getTreatPrecisionlessNumAsDeci() {
     return Boolean.TRUE.equals(treatPrecisionlessNumAsDeci);
   }
 
-  public Boolean getTreatAsTimestampForLocalTimeZone() {
-    return Boolean.TRUE.equals(treatAsTimestampForLocalTimeZone);
+  public Boolean getTreatTimestampLTZAsTimestamp() {
+    return Boolean.TRUE.equals(treatTimestampLTZAsTimestamp);
   }
 
   @Override

oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleConstants.java

@@ -46,7 +46,7 @@ private OracleConstants() {
   public static final String USE_SSL = "useSSL";
   public static final String TREAT_AS_OLD_TIMESTAMP = "treatAsOldTimestamp";
   public static final String TREAT_PRECISIONLESSNUM_AS_DECI = "treatPrecisionlessNumAsDeci";
-  public static final String TREAT_AS_TIMESTAMP_FOR_LOCAL_TIME_ZONE = "treatAsTimestampForLocalTimeZone";
+  public static final String TREAT_TIMESTAMP_LTZ_AS_TIMESTAMP = "treatTimestampLTZAsTimestamp";
 
   /**
    * Constructs the Oracle connection string based on the provided connection type, host, port, and database.

oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleSource.java

@@ -68,10 +68,10 @@ protected SchemaReader getSchemaReader() {
     // handle schema to make it backward compatible.
     boolean treatAsOldTimestamp = oracleSourceConfig.getConnection().getTreatAsOldTimestamp();
     boolean treatPrecisionlessNumAsDeci = oracleSourceConfig.getConnection().getTreatPrecisionlessNumAsDeci();
-    boolean treatAsTimestampForLocalTimeZone = oracleSourceConfig.getConnection().getTreatAsTimestampForLocalTimeZone();
+    boolean treatTimestampLTZAsTimestamp = oracleSourceConfig.getConnection().getTreatTimestampLTZAsTimestamp();
 
     return new OracleSourceSchemaReader(null, treatAsOldTimestamp, treatPrecisionlessNumAsDeci,
-                                        treatAsTimestampForLocalTimeZone);
+                                        treatTimestampLTZAsTimestamp);
   }
 
   @Override
@@ -139,10 +139,10 @@ public OracleSourceConfig(String host, int port, String user, String password, S
                               int defaultBatchValue, int defaultRowPrefetch,
                               String importQuery, Integer numSplits, int fetchSize,
                               String boundingQuery, String splitBy, Boolean useSSL, Boolean treatAsOldTimestamp,
-                              Boolean treatPrecisionlessNumAsDeci, Boolean treatAsTimestampForLocalTimeZone) {
+                              Boolean treatPrecisionlessNumAsDeci, Boolean treatTimestampLTZAsTimestamp) {
       this.connection = new OracleConnectorConfig(host, port, user, password, jdbcPluginName, connectionArguments,
                                                   connectionType, database, role, useSSL, treatAsOldTimestamp,
-                                                  treatPrecisionlessNumAsDeci, treatAsTimestampForLocalTimeZone);
+                                                  treatPrecisionlessNumAsDeci, treatTimestampLTZAsTimestamp);
       this.defaultBatchValue = defaultBatchValue;
       this.defaultRowPrefetch = defaultRowPrefetch;
       this.fetchSize = fetchSize;

oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleSourceSchemaReader.java

@@ -69,17 +69,17 @@ public class OracleSourceSchemaReader extends CommonSchemaReader {
   private final String sessionID;
   private final Boolean isTimestampOldBehavior;
   private final Boolean isPrecisionlessNumAsDecimal;
-  private final Boolean isLtzFieldTimestamp;
+  private final Boolean isTimestampLtzFieldTimestamp;
 
   public OracleSourceSchemaReader() {
     this(null, false, false, false);
   }
   public OracleSourceSchemaReader(@Nullable String sessionID, boolean isTimestampOldBehavior,
-                                  boolean isPrecisionlessNumAsDecimal, boolean isLtzFieldTimestamp) {
+                                  boolean isPrecisionlessNumAsDecimal, boolean isTimestampLtzFieldTimestamp) {
     this.sessionID = sessionID;
     this.isTimestampOldBehavior = isTimestampOldBehavior;
     this.isPrecisionlessNumAsDecimal = isPrecisionlessNumAsDecimal;
-    this.isLtzFieldTimestamp = isLtzFieldTimestamp;
+    this.isTimestampLtzFieldTimestamp = isTimestampLtzFieldTimestamp;
   }
 
   @Override
@@ -142,11 +142,7 @@ public Schema getSchema(ResultSetMetaData metadata, int index) throws SQLExcepti
   }
 
   private @NotNull Schema getTimestampLtzSchema() {
-    if (Boolean.TRUE.equals(isLtzFieldTimestamp)) {
-      return Schema.of(Schema.LogicalType.TIMESTAMP_MICROS);
-    }
-
-    return isTimestampOldBehavior
+    return isTimestampOldBehavior || isTimestampLtzFieldTimestamp
       ? Schema.of(Schema.LogicalType.TIMESTAMP_MICROS)
       : Schema.of(Schema.LogicalType.DATETIME);
   }

oracle-plugin/widgets/Oracle-batchsource.json

@@ -160,8 +160,8 @@
         },
         {
           "widget-type": "hidden",
-          "label": "Treat as Timestamp for Timestamp_LTZ",
-          "name": "treatAsTimestampForLocalTimeZone",
+          "label": "Treat Timestamp_LTZ as Timestamp",
+          "name": "treatTimestampLTZAsTimestamp",
           "widget-attributes": {
             "layout": "inline",
             "default": "false",

oracle-plugin/widgets/Oracle-connector.json

@@ -170,8 +170,8 @@
         },
         {
           "widget-type": "hidden",
-          "label": "Treat as Timestamp for Timestamp_LTZ",
-          "name": "treatAsTimestampForLocalTimeZone",
+          "label": "Treat Timestamp_LTZ as Timestamp",
+          "name": "treatTimestampLTZAsTimestamp",
           "widget-attributes": {
             "layout": "inline",
             "default": "false",