Issues #21 and #29

mattcasters · Dec 14, 2018 · 7f78779 · 7f78779
1 parent 5897aa2
commit 7f78779
Show file tree

Hide file tree

Showing 14 changed files with 903 additions and 138 deletions.
diff --git a/src/main/java/org/pentaho/di/dataset/TransUnitTestSetLocation.java b/src/main/java/org/pentaho/di/dataset/TransUnitTestSetLocation.java
@@ -91,13 +91,4 @@ public List<String> getFieldOrder() {
   public void setFieldOrder(List<String> fieldOrder) {
     this.fieldOrder = fieldOrder;
   }
-
-  public String findSetFieldInMapping(String stepFieldName) {
-    for (TransUnitTestFieldMapping fieldMapping : fieldMappings) {
-      if (fieldMapping.getStepFieldName().equalsIgnoreCase(stepFieldName)) {
-        return fieldMapping.getDataSetFieldName();
-      }
-    }
-    return null;
-  }
 }
diff --git a/src/main/java/org/pentaho/di/dataset/spoon/dialog/DataSetDialog.java b/src/main/java/org/pentaho/di/dataset/spoon/dialog/DataSetDialog.java
@@ -57,6 +57,7 @@
 import org.pentaho.di.dataset.DataSet;
 import org.pentaho.di.dataset.DataSetField;
 import org.pentaho.di.dataset.DataSetGroup;
+import org.pentaho.di.dataset.DataSetGroupType;
 import org.pentaho.di.dataset.spoon.DataSetHelper;
 import org.pentaho.di.dataset.util.DataSetConst;
 import org.pentaho.di.i18n.BaseMessages;
@@ -421,6 +422,11 @@ protected void getMetadataFromTable() {
       getInfo(set);
       DataSetGroup group = set.getGroup();
 
+      if (group.getType()!= DataSetGroupType.Database ) {
+        return;
+      }
+      group.verifySettings();
+
       String schemaTable = group.getDatabaseMeta().getQuotedSchemaTableCombination( group.getSchemaName(), wTableName.getText() );
 
       Database database = null;