Merge pull request #1334 from dimagi/queryDataFix

Fix backward compatibility for Stack Query Datum
dimagi · Sep 14, 2023 · d37dabb · d37dabb
2 parents 7aea837 + 972034d
commit d37dabb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/commcare/suite/model/StackFrameStep.java b/src/main/java/org/commcare/suite/model/StackFrameStep.java
@@ -218,6 +218,10 @@ public StackFrameStep defineStep(EvaluationContext ec, SessionDatum neededDatum)
                 extras.forEach((key, value) -> {
                     if (value instanceof QueryData) {
                         defined.addExtra(key, ((QueryData)value).getValues(ec));
+                    } else if (value instanceof XPathExpression) {
+                        // only to maintain backward compatibility with old serialised app db state, can be removed in
+                        // subsequent deploys
+                        defined.addExtra(key, FunctionUtils.toString(((XPathExpression)value).eval(ec)));
                     } else {
                         throw new RuntimeException("Invalid data type for step extra " + key);
                     }