Added support for nested lookups in ETL unit test framework.

OHDSI · Apr 13, 2017 · 5556679 · 5556679
1 parent 27052d7
commit 5556679
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/org/ohdsi/rabbitInAHat/ETLTestFrameWorkGenerator.java b/src/org/ohdsi/rabbitInAHat/ETLTestFrameWorkGenerator.java
@@ -175,6 +175,8 @@ private static void createLookupFunctions(List<String> r, Database database) {
 					testDefs.add("    }");
 					testDefs.add("    if (is.null(" + rFieldName + ")) {");
 					testDefs.add("      statement <- paste0(statement, \" " + sqlFieldName + " IS NULL\")");
+					testDefs.add("    } else if (is(" + rFieldName + ", \"subQuery\")){");
+					testDefs.add("      statement <- paste0(statement, \" " + sqlFieldName + " = (\", as.character(" + rFieldName + "), \")\")");
 					testDefs.add("    } else {");
 					testDefs.add("      statement <- paste0(statement, \" " + sqlFieldName + " = '\", " + rFieldName + ",\"'\")");
 					testDefs.add("    }");

diff --git a/src/org/ohdsi/whiteRabbit/WhiteRabbitMain.java b/src/org/ohdsi/whiteRabbit/WhiteRabbitMain.java
@@ -103,7 +103,6 @@ public class WhiteRabbitMain implements ActionListener {
 	private JTextField			targetServerField;
 	private JTextField			targetDatabaseField;
 	private JTextField			sourceDelimiterField;
-	private JTextField			targetDelimiterField;
 	private JComboBox<String> 	targetCSVFormat;
 	private JTextField			sourceServerField;
 	private JTextField			sourceUserField;