Issue #21 (NPE fix) for 0.2.0

mattcasters · Jan 12, 2019 · 4b34111 · 4b34111
1 parent 8a98fe1
commit 4b34111
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/org/kettle/beam/steps/bq/BeamBQInputDialog.java b/src/main/java/org/kettle/beam/steps/bq/BeamBQInputDialog.java
@@ -186,7 +186,7 @@ public String open() {
     ColumnInfo[] columns = new ColumnInfo[] {
       new ColumnInfo( BaseMessages.getString( PKG, "BeamBQInputDialog.Fields.Column.Name" ), ColumnInfo.COLUMN_TYPE_TEXT, false, false ),
       new ColumnInfo( BaseMessages.getString( PKG, "BeamBQInputDialog.Fields.Column.NewName" ), ColumnInfo.COLUMN_TYPE_TEXT, false, false ),
-      new ColumnInfo( BaseMessages.getString( PKG, "BeamBQInputDialog.Fields.Column.NewName" ), ColumnInfo.COLUMN_TYPE_CCOMBO, ValueMetaFactory.getValueMetaNames(), false ),
+      new ColumnInfo( BaseMessages.getString( PKG, "BeamBQInputDialog.Fields.Column.KettleType" ), ColumnInfo.COLUMN_TYPE_CCOMBO, ValueMetaFactory.getValueMetaNames(), false ),
     };
     wFields = new TableView( Variables.getADefaultVariableSpace(), shell, SWT.NONE, columns, input.getFields().size(), null, props);
     props.setLook( wFields );

diff --git a/src/main/java/org/kettle/beam/steps/bq/messages/messages_en_US.properties b/src/main/java/org/kettle/beam/steps/bq/messages/messages_en_US.properties
@@ -4,6 +4,9 @@ BeamBQInputDialog.DatasetId = Data Set ID
 BeamBQInputDialog.TableId = Table ID
 BeamBQInputDialog.Query = Query (blank mean everything)
 BeamBQInputDialog.Fields = Return fields selection:
+BeamBQInputDialog.Fields.Column.Name = BQ Field name
+BeamBQInputDialog.Fields.Column.NewName = Rename to... (optional)
+BeamBQInputDialog.Fields.Column.KettleType = Kettle data type
 
 BeamBQOutputDialog.DialogTitle = Beam BigQuery Output
 BeamBQOutputDialog.ProjectId = Project ID