fix: make sure to load the record from the database in toElement if t…

…he result has a @Rid field, issue #10268
orientechnologies · Sep 27, 2024 · 0c82fc9 · 0c82fc9
1 parent 1ee0396
commit 0c82fc9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/OResultInternal.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/OResultInternal.java
@@ -1,6 +1,7 @@
 package com.orientechnologies.orient.core.sql.executor;
 
 import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
+import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.id.OContextualRecordId;
 import com.orientechnologies.orient.core.id.ORID;
@@ -294,6 +295,10 @@ public OElement toElement() {
     if (isElement()) {
       return getElement().get();
     }
+    if (hasProperty("@rid") && ODatabaseRecordThreadLocal.instance().isDefined()) {
+      ODocument doc = ODatabaseRecordThreadLocal.instance().get().load((ORID) getProperty("@rid"));
+      return doc;
+    }
     ODocument doc = new ODocument();
     for (String s : getPropertyNames()) {
       if (s == null) {