Fix calculation of SQL function parameters, also including context an…

…d metadata values (eg. LET values) Resolves: #8671
orientechnologies · Nov 22, 2018 · 03e724d · 03e724d
1 parent 35cb718
commit 03e724d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OFunctionCall.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OFunctionCall.java
@@ -117,7 +117,9 @@ record = current;
       }
     }
     for (OExpression expr : this.params) {
-      if (record instanceof OIdentifiable) {
+      if(targetObjects instanceof OResult) {
+        paramValues.add(expr.execute((OResult) targetObjects, ctx));
+      }else if (record instanceof OIdentifiable) {
         paramValues.add(expr.execute((OIdentifiable) record, ctx));
       } else if (record instanceof OResult) {
         paramValues.add(expr.execute((OResult) record, ctx));