fix: corrected query with content of nested json documents to use emb…

…edded class
orientechnologies · Feb 12, 2024 · 2a88158 · 2a88158
1 parent d367b8d
commit 2a88158
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OExpression.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OExpression.java
@@ -65,7 +65,7 @@ public Object execute(OIdentifiable iCurrentRecord, OCommandContext ctx) {
       return arrayConcatExpression.execute(iCurrentRecord, ctx);
     }
     if (json != null) {
-      return json.toMap(iCurrentRecord, ctx);
+      return json.toObjectDetermineType(iCurrentRecord, ctx);
     }
     if (booleanValue != null) {
       return booleanValue;

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OJson.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OJson.java
@@ -5,11 +5,13 @@
 import com.orientechnologies.orient.core.command.OCommandContext;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.metadata.schema.OType;
+import com.orientechnologies.orient.core.record.OElement;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.record.impl.ODocumentHelper;
 import com.orientechnologies.orient.core.serialization.serializer.record.string.OFieldTypesString;
 import com.orientechnologies.orient.core.sql.executor.OResult;
 import com.orientechnologies.orient.core.sql.executor.OResultInternal;
+import com.orientechnologies.orient.core.sql.executor.OUpdatableResult;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -134,6 +136,20 @@ public Object toObjectDetermineType(OResult source, OCommandContext ctx) {
     }
   }
 
+  public Object toObjectDetermineType(OIdentifiable source, OCommandContext ctx) {
+    String className = getClassNameForDocument(ctx);
+    String type = getTypeForDocument(ctx);
+    if (className != null || (type != null && "d".equalsIgnoreCase(type))) {
+      OUpdatableResult element = null;
+      if (source != null) {
+        element = new OUpdatableResult((OElement) ctx.getDatabase().load(source.getIdentity()));
+      }
+      return toDocument(element, ctx, className);
+    } else {
+      return toMap(source, ctx);
+    }
+  }
+
   public Map<String, Object> toMap(OIdentifiable source, OCommandContext ctx) {
     Map<String, Object> doc = new LinkedHashMap<String, Object>();
     for (OJsonItem item : items) {