Makes subqueries use NullDefaultCaseInsensitiveParameterSource. If subquery uses a bound parameter that is not present in the main item properties, then null is used for the parameter value.

Author: Eric Meyer

src/main/java/com/t11e/discovery/datatool/CreateActionRowCallbackHandler.java

@@ -169,7 +169,7 @@ else if (previousValue instanceof Collection)
 
   private void performSubqueriesAndStreamItem(final String id, final Map<String, Object> properties)
   {
-    final CaseInsensitveParameterSource subqueryParams = new CaseInsensitveParameterSource(properties);
+    final CaseInsensitveParameterSource subqueryParams = new NullDefaultCaseInsensitiveParameterSource(properties);
     for (int i = 0; i < subqueries.size(); ++i)
     {
       final SubQuery subquery = subqueries.get(i);

src/main/java/com/t11e/discovery/datatool/NullDefaultCaseInsensitiveParameterSource.java

@@ -0,0 +1,30 @@
+package com.t11e.discovery.datatool;
+
+import java.util.Map;
+
+
+public class NullDefaultCaseInsensitiveParameterSource
+  extends CaseInsensitveParameterSource
+{
+
+  public NullDefaultCaseInsensitiveParameterSource()
+  {
+    super();
+  }
+
+  public NullDefaultCaseInsensitiveParameterSource(final Map<String, Object> params)
+  {
+    super(params);
+  }
+
+  public NullDefaultCaseInsensitiveParameterSource(final String paramName, final Object value)
+  {
+    super(paramName, value);
+  }
+
+  @Override
+  public boolean hasValue(final String paramName)
+  {
+    return true;
+  }
+}

src/test/java/com/t11e/discovery/datatool/SubqueryTest.xml

@@ -36,10 +36,13 @@
       <snapshot>
         <set-item idColumn="id">
           <query><![CDATA[
-          select * from SubqueryContent
+          select c.*, '' as "bound" from SubqueryContent c
         ]]></query>
           <subquery property="color" type="delimited"><![CDATA[
           select asnumber from SubqueryColors where parent_id=:id order by name
+        ]]></subquery>
+          <subquery property="sometimes_has_bound" ><![CDATA[
+          select 'hello' as "greeting" from SubqueryColors where parent_id=:id and '' != :bound
         ]]></subquery>
         </set-item>
         <remove-item idColumn="id">