Merge pull request #3361 from bamaer/3281

date, time formats, dialog defaults, i18n update. #3281
apache · Nov 8, 2023 · 3c3579e · 3c3579e
2 parents dfd02bb + 0cb5f8c
commit 3c3579e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.../main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoader.java b/.../main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoader.java
@@ -297,6 +297,8 @@ private String buildCopyStatementSqlString() {
     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 '\"'");
@@ -462,7 +464,7 @@ private void writeRowToFile(IRowMeta rowMeta, Object[] row) throws HopTransformE
             boolean needConversion = false;
             if (v.getType() == IValueMeta.TYPE_TIMESTAMP) {
               v = new ValueMetaDate();
-              v.setConversionMask("yyyy/MM/dd HH:mm:ss");
+              v.setConversionMask("yyyy/MM/dd HH:mm:ss.SSS");
               needConversion = true;
             } else if (v.getType() == IValueMeta.TYPE_DATE) {
               v = new ValueMetaDate();

diff --git a/...java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderDialog.java b/...java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderDialog.java
@@ -571,6 +571,8 @@ public void widgetSelected(SelectionEvent e) {
     PropsUi.setLook(wCopyFromFilename);
     wCopyFromFilename.addModifyListener(lsMod);
     wCopyFromFilename.addFocusListener(lsFocusLost);
+    wCopyFromFilename.getTextWidget().setMessage("s3://<FILENAME_IN_BUCKET>");
+
     FormData fdCopyFromFile = new FormData();
     fdCopyFromFile.top = new FormAttachment(lastControl, margin*2);
     fdCopyFromFile.left = new FormAttachment(middle, 0);

diff --git a/...n/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderMeta.java b/...n/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderMeta.java
@@ -143,7 +143,7 @@ public class RedshiftBulkLoaderMeta
           injectionKey = "STREAM_TO_S3",
           injectionKeyDescription = ""
   )
-  private boolean streamToS3Csv;
+  private boolean streamToS3Csv = true;
 
   /** CSV: Trim whitespace */
   @HopMetadataProperty(key = "trim_whitespace", injectionKeyDescription = "")

diff --git a/...org/apache/hop/pipeline/transforms/redshift/bulkloader/messages/messages_en_US.properties b/...org/apache/hop/pipeline/transforms/redshift/bulkloader/messages/messages_en_US.properties
@@ -22,7 +22,7 @@ RedshiftBulkLoaderDialog.StreamCsvToS3.Label=Stream to S3 CSV
 RedshiftBulkLoaderDialog.StreamCsvToS3.Tooltip=Writes the current pipeline stream to a file in an S3 bucket before copying into Redshift. 
 RedshiftBulkLoaderDialog.LoadFromExistingFile.Label=Load from existing file
 RedshiftBulkLoaderDialog.LoadFromExistingFile.Tooltip=Copy data into Redshift table from an existing file. 
-RedshiftBulkLoaderDialog.CopyFromFile.Label=Copy into Redshift from existing file
+RedshiftBulkLoaderDialog.CopyFromFile.Label=Copy into Redshift from file name/path
 RedshiftBulkLoader.Connection.Connected=Connected to database {0} 
 RedshiftBulkLoaderDialog.Authenticate.Options.Label=AWS authentication
 RedshiftBulkLoaderDialog.Authenticate.UseSystemVars.Label=Use AWS system variables