You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/07/12 16:06:03 UTC
[incubator-hop] branch master updated: HOP-3088: fix persistance of
data and unit-test (#931)
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/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 8d9a37a HOP-3088: fix persistance of data and unit-test (#931)
8d9a37a is described below
commit 8d9a37ac307c606ebcb45d6004605a34c55e333e
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Mon Jul 12 16:35:11 2021 +0200
HOP-3088: fix persistance of data and unit-test (#931)
* HOP-3088: fix persistance of data and unit-test
* HOP-3088: fix test
---
.../database/0006-insert-table-output.hpl | 52 +++++++++++-----------
.../transforms/tableoutput/TableOutputField.java | 2 +-
.../tableoutput/TableOutputMetaTest.java | 22 ++++-----
3 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/integration-tests/database/0006-insert-table-output.hpl b/integration-tests/database/0006-insert-table-output.hpl
index f58301a..bab7177 100644
--- a/integration-tests/database/0006-insert-table-output.hpl
+++ b/integration-tests/database/0006-insert-table-output.hpl
@@ -59,26 +59,26 @@ limitations under the License.
</partitioning>
<fields>
<field>
- <name>key</name>
- <type>String</type>
- <format/>
<currency/>
<decimal/>
+ <set_empty_string>N</set_empty_string>
+ <format/>
<group/>
<length>-1</length>
+ <name>key_data</name>
<precision>-1</precision>
- <set_empty_string>N</set_empty_string>
+ <type>String</type>
</field>
<field>
- <name>value</name>
- <type>String</type>
- <format/>
<currency/>
<decimal/>
+ <set_empty_string>N</set_empty_string>
+ <format/>
<group/>
<length>-1</length>
+ <name>value_data</name>
<precision>-1</precision>
- <set_empty_string>N</set_empty_string>
+ <type>String</type>
</field>
</fields>
<data>
@@ -120,33 +120,33 @@ limitations under the License.
<method>none</method>
<schema_name/>
</partitioning>
- <connection>unit-test-db</connection>
- <schema>public</schema>
- <table>testtable</table>
<commit>1000</commit>
- <truncate>Y</truncate>
- <ignore_errors>N</ignore_errors>
- <use_batch>Y</use_batch>
- <specify_fields>Y</specify_fields>
- <partitioning_enabled>N</partitioning_enabled>
- <partitioning_field/>
- <partitioning_daily>N</partitioning_daily>
- <partitioning_monthly>Y</partitioning_monthly>
- <tablename_in_field>N</tablename_in_field>
- <tablename_field/>
- <tablename_in_table>Y</tablename_in_table>
- <return_keys>N</return_keys>
- <return_field/>
+ <connection>unit-test-db</connection>
<fields>
<field>
<column_name>key</column_name>
- <stream_name>key</stream_name>
+ <stream_name>key_data</stream_name>
</field>
<field>
<column_name>value</column_name>
- <stream_name>value</stream_name>
+ <stream_name>value_data</stream_name>
</field>
</fields>
+ <return_field/>
+ <ignore_errors>N</ignore_errors>
+ <partitioning_daily>N</partitioning_daily>
+ <partitioning_enabled>N</partitioning_enabled>
+ <partitioning_field/>
+ <partitioning_monthly>Y</partitioning_monthly>
+ <return_keys>N</return_keys>
+ <schema>public</schema>
+ <specify_fields>Y</specify_fields>
+ <table>testtable</table>
+ <tablename_field/>
+ <tablename_in_field>N</tablename_in_field>
+ <tablename_in_table>Y</tablename_in_table>
+ <truncate>Y</truncate>
+ <use_batch>Y</use_batch>
<attributes/>
<GUI>
<xloc>336</xloc>
diff --git a/plugins/transforms/tableoutput/src/main/java/org/apache/hop/pipeline/transforms/tableoutput/TableOutputField.java b/plugins/transforms/tableoutput/src/main/java/org/apache/hop/pipeline/transforms/tableoutput/TableOutputField.java
index 449ec67..a016419 100644
--- a/plugins/transforms/tableoutput/src/main/java/org/apache/hop/pipeline/transforms/tableoutput/TableOutputField.java
+++ b/plugins/transforms/tableoutput/src/main/java/org/apache/hop/pipeline/transforms/tableoutput/TableOutputField.java
@@ -25,7 +25,7 @@ public class TableOutputField {
public TableOutputField() {}
- public TableOutputField(String fieldStream, String fieldDatabase) {
+ public TableOutputField( String fieldDatabase, String fieldStream) {
this.fieldDatabase = fieldDatabase;
this.fieldStream = fieldStream;
}
diff --git a/plugins/transforms/tableoutput/src/test/java/org/apache/hop/pipeline/transforms/tableoutput/TableOutputMetaTest.java b/plugins/transforms/tableoutput/src/test/java/org/apache/hop/pipeline/transforms/tableoutput/TableOutputMetaTest.java
index cbc3cb1..f7d6595 100644
--- a/plugins/transforms/tableoutput/src/test/java/org/apache/hop/pipeline/transforms/tableoutput/TableOutputMetaTest.java
+++ b/plugins/transforms/tableoutput/src/test/java/org/apache/hop/pipeline/transforms/tableoutput/TableOutputMetaTest.java
@@ -88,9 +88,9 @@ public class TableOutputMetaTest implements IInitializer<ITransformMeta> {
@Test
public void testProvidesModeler() throws Exception {
TableOutputMeta tableOutputMeta = new TableOutputMeta();
- tableOutputMeta.getFields().add(new TableOutputField("s4", "f1"));
- tableOutputMeta.getFields().add(new TableOutputField("s5", "f2"));
- tableOutputMeta.getFields().add(new TableOutputField("s6", "f3"));
+ tableOutputMeta.getFields().add(new TableOutputField("f1", "s4"));
+ tableOutputMeta.getFields().add(new TableOutputField("f2", "s5"));
+ tableOutputMeta.getFields().add(new TableOutputField("f3", "s6"));
TableOutputData tableOutputData = new TableOutputData();
tableOutputData.insertRowMeta = mock(RowMeta.class);
@@ -130,9 +130,9 @@ public class TableOutputMetaTest implements IInitializer<ITransformMeta> {
public void testClone() throws Exception {
TableOutputMeta tableOutputMeta = new TableOutputMeta();
tableOutputMeta.setDefault();
- tableOutputMeta.getFields().add(new TableOutputField("1", "d1"));
- tableOutputMeta.getFields().add(new TableOutputField("2", "d2"));
- tableOutputMeta.getFields().add(new TableOutputField("3", "d3"));
+ tableOutputMeta.getFields().add(new TableOutputField("d1", "1"));
+ tableOutputMeta.getFields().add(new TableOutputField("d2", "2"));
+ tableOutputMeta.getFields().add(new TableOutputField("d3", "3"));
TableOutputMeta clone = (TableOutputMeta) tableOutputMeta.clone();
assertNotSame(clone, tableOutputMeta);
assertEquals(clone.getXml(), tableOutputMeta.getXml());
@@ -182,11 +182,11 @@ public class TableOutputMetaTest implements IInitializer<ITransformMeta> {
.getFields()
.addAll(
Arrays.asList(
- new TableOutputField("StreamField1", "DatabaseField1"),
- new TableOutputField("StreamField2", "DatabaseField2"),
- new TableOutputField("StreamField3", "DatabaseField3"),
- new TableOutputField("StreamField4", "DatabaseField4"),
- new TableOutputField("StreamField5", "DatabaseField5")));
+ new TableOutputField("DatabaseField1","StreamField1" ),
+ new TableOutputField("DatabaseField2","StreamField2" ),
+ new TableOutputField("DatabaseField3", "StreamField3" ),
+ new TableOutputField("DatabaseField4","StreamField4" ),
+ new TableOutputField("DatabaseField5","StreamField5" )));
}
}