浏览代码

HPCC-10542 Support dependent actions in the same graph

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 11 年之前
父节点
当前提交
2aa0e8bd97
共有 1 个文件被更改,包括 9 次插入3 次删除
  1. 9 3
      ecl/hqlcpp/hqlresource.cpp

+ 9 - 3
ecl/hqlcpp/hqlresource.cpp

@@ -4824,9 +4824,15 @@ IHqlExpression * EclResourcer::createResourced(IHqlExpression * expr, ResourceGr
             }
             else
             {
-                IHqlExpression * uid = info->transformed->queryAttribute(_uid_Atom);
-                source = createValue(no_callsideeffect, makeVoidType(), LINK(uid));
-                //source = LINK(info->transformed);
+                IHqlExpression * transformed = info->transformed;
+                if (transformed->getOperator() == no_definesideeffect)
+                {
+                    IHqlExpression * uid = info->transformed->queryAttribute(_uid_Atom);
+                    assertex(uid);
+                    source = createValue(no_callsideeffect, makeVoidType(), LINK(uid));
+                }
+                else
+                    source = LINK(transformed);
             }
         }