HPCC-16267 Fix internal error on index with grandchild datasets with a row

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

ecl/hql/hqlexpr.cpp

@@ -3213,6 +3213,7 @@ IHqlExpression * ensureExprType(IHqlExpression * expr, ITypeInfo * type, node_op
                     return LINK(expr);
                 break;
             }
+            break;
         }
     case type_dictionary:
     case type_table:

ecl/hqlcpp/hqlckey.cpp

@@ -185,7 +185,7 @@ IHqlExpression * convertIndexPhysical2LogicalValue(IHqlExpression * cur, IHqlExp
         return ensureExprType(newValue, type);
     }
     else
-        return LINK(physicalSelect);
+        return ensureExprType(physicalSelect, cur->queryType());
 }
 
 

ecl/regress/issue16267.ecl

@@ -0,0 +1,16 @@
+r0 := { unsigned id0; };
+
+r1 := { dataset(r0) id0s; };
+
+r2 := { dataset(r1) ids };
+
+r3 := {
+    string11 f_name;
+    r2 child;
+};
+
+ds := dataset([], r3);
+
+i := index(ds, { f_name } , { ds}, 'magic');
+
+i;