fix: first fixes in traverse with variables implementation, issue #10292

orientechnologies · Sep 10, 2024 · fd8a616 · fd8a616
1 parent 75e3e0f
commit fd8a616
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/command/OBasicCommandContext.java b/core/src/main/java/com/orientechnologies/orient/core/command/OBasicCommandContext.java
@@ -26,6 +26,7 @@
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.record.impl.ODocumentHelper;
 import com.orientechnologies.orient.core.serialization.serializer.OStringSerializerHelper;
+import com.orientechnologies.orient.core.sql.executor.OResult;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -121,8 +122,13 @@ else if (firstPart.equalsIgnoreCase("ROOT")) {
         else result = getVariableFromParentHierarchy(firstPart);
       }
     }
-
-    if (pos > -1) result = ODocumentHelper.getFieldValue(result, lastPart, this);
+    if (pos > -1) {
+      if (result instanceof OResult) {
+        result = ODocumentHelper.getFieldValue(((OResult) result).toElement(), lastPart, this);
+      } else {
+        result = ODocumentHelper.getFieldValue(result, lastPart, this);
+      }
+    }
 
     return result != null ? resolveValue(result) : iDefault;
   }

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/OSQLEngine.java b/core/src/main/java/com/orientechnologies/orient/core/sql/OSQLEngine.java
@@ -347,7 +347,11 @@ public static Object foreachRecord(
           for (Object inner : OMultiValue.getMultiValueIterable(o, false)) {
             result.add(iCallable.call((OIdentifiable) inner));
           }
-        } else result.add(iCallable.call((OIdentifiable) o));
+        } else if (o instanceof OIdentifiable) {
+          result.add(iCallable.call((OIdentifiable) o));
+        } else if (o instanceof OResult) {
+          return iCallable.call(((OResult) o).toElement());
+        }
       }
       return result;
     } else if (iCurrent instanceof OIdentifiable) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/FetchFromVariableStep.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/FetchFromVariableStep.java
@@ -4,6 +4,7 @@
 import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.orient.core.command.OCommandContext;
 import com.orientechnologies.orient.core.exception.OCommandExecutionException;
+import com.orientechnologies.orient.core.id.ORID;
 import com.orientechnologies.orient.core.record.OElement;
 import com.orientechnologies.orient.core.sql.executor.resultset.OLimitedResultSet;
 import com.orientechnologies.orient.core.sql.parser.OFromItem;
@@ -92,6 +93,9 @@ private void init() {
     } else if (src instanceof OResultSet) {
       source = (OResultSet) src;
       source.reset();
+    } else if (src instanceof ORID) {
+      source = new OInternalResultSet();
+      ((OInternalResultSet) source).add(new OResultInternal(ctx.getDatabase().load((ORID) src)));
     } else if (src instanceof OElement) {
       source = new OInternalResultSet();
       ((OInternalResultSet) source).add(new OResultInternal((OElement) src));