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 0cb5f8ca9e date, time formats, dialog defaults, i18n update. #3281
new 3c3579e0fb Merge pull request #3361 from bamaer/3281
0cb5f8ca9e is described below
commit 0cb5f8ca9e17177873b7cdc28a03d2a8f3c91b16
Author: Bart Maertens <[email protected]>
AuthorDate: Wed Nov 8 13:09:31 2023 +0100
date, time formats, dialog defaults, i18n update. #3281
---
.../pipeline/transforms/redshift/bulkloader/RedshiftBulkLoader.java | 4 +++-
.../transforms/redshift/bulkloader/RedshiftBulkLoaderDialog.java | 2 ++
.../transforms/redshift/bulkloader/RedshiftBulkLoaderMeta.java | 2 +-
.../transforms/redshift/bulkloader/messages/messages_en_US.properties | 2 +-
4 files changed, 7 insertions(+), 3 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 51ba264776..54c39d4fa7 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
@@ -297,6 +297,8 @@ 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 '\"'");
@@ -462,7 +464,7 @@ public class RedshiftBulkLoader extends
BaseTransform<RedshiftBulkLoaderMeta, Re
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/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderDialog.java
b/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderDialog.java
index b9996ed03a..85f5f8b137 100644
---
a/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderDialog.java
+++
b/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderDialog.java
@@ -571,6 +571,8 @@ public class RedshiftBulkLoaderDialog extends
BaseTransformDialog implements ITr
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/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderMeta.java
b/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderMeta.java
index abec768573..8e7313537e 100644
---
a/plugins/tech/aws/src/main/java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderMeta.java
+++
b/plugins/tech/aws/src/main/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/plugins/tech/aws/src/main/resources/org/apache/hop/pipeline/transforms/redshift/bulkloader/messages/messages_en_US.properties
b/plugins/tech/aws/src/main/resources/org/apache/hop/pipeline/transforms/redshift/bulkloader/messages/messages_en_US.properties
index 9170c32d1b..6fe9e251bf 100644
---
a/plugins/tech/aws/src/main/resources/org/apache/hop/pipeline/transforms/redshift/bulkloader/messages/messages_en_US.properties
+++
b/plugins/tech/aws/src/main/resources/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
