(hop) branch master updated: CSV only options moved to CSV. #3281

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 12ebd346dc CSV only options moved to CSV. #3281
     new 2779c1f2b7 Merge pull request #3385 from bamaer/3281
12ebd346dc is described below

commit 12ebd346dc74b33ea7bcd474c41edad645426723
Author: Bart Maertens <bart.maert...@know.bi>
AuthorDate: Sat Nov 11 07:19:58 2023 +0100

    CSV only options moved to CSV. #3281
---
 .../transforms/redshift/bulkloader/RedshiftBulkLoader.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoader.java
 
b/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoader.java
index 54c39d4fa7..ff4e2c0ce8 100644
--- 
a/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoader.java
+++ 
b/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoader.java
@@ -295,13 +295,13 @@ public class RedshiftBulkLoader extends 
BaseTransform<RedshiftBulkLoaderMeta, Re
     }
 
     sb.append(" FROM '" + resolve(meta.getCopyFromFilename()) + "'");
-    sb.append(" NULL '' ");
-    sb.append(" EMPTYASNULL ");
-    sb.append("DATEFORMAT AS 'YYYY/MM/DD' ");
-    sb.append("TIMEFORMAT AS 'YYYY/MM/DD HH:MI:SS'");
     if(meta.isStreamToS3Csv() || 
meta.getLoadFromExistingFileFormat().equals("CSV")){
       sb.append(" DELIMITER ',' ");
       sb.append(" CSV QUOTE AS '\"'");
+      sb.append(" NULL '' ");
+      sb.append(" EMPTYASNULL ");
+      sb.append("DATEFORMAT AS 'YYYY/MM/DD' ");
+      sb.append("TIMEFORMAT AS 'YYYY/MM/DD HH:MI:SS'");
     }
     if(meta.isUseAwsIamRole()){
       sb.append(" iam_role '" + meta.getAwsIamRole() + "'");