Fix UPDATE SET on embedded maps with subqueries

Resolves: #8583
orientechnologies · Oct 5, 2018 · 75cab1f · 75cab1f
1 parent 7c2b68b
commit 75cab1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OModifier.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OModifier.java
@@ -291,6 +291,7 @@ protected void setValue(OResult currentRecord, Object target, Object value, OCom
   }
 
   private void doSetValue(OResult currentRecord, Object target, Object value, OCommandContext ctx) {
+    value = OUpdateItem.convertResultToDocument(value);
     if (methodCall != null) {
       //do nothing
     } else if (suffix != null) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OUpdateItem.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OUpdateItem.java
@@ -194,7 +194,7 @@ private static Object convertToType(Object item, OClass linkedClass, OCommandCon
     return item;
   }
 
-  private Object convertResultToDocument(Object value) {
+  public static Object convertResultToDocument(Object value) {
     if (value instanceof OResult) {
       return ((OResult) value).toElement();
     }
@@ -210,7 +210,7 @@ private Object convertResultToDocument(Object value) {
     return value;
   }
 
-  private boolean containsOResult(Collection value) {
+  public static boolean containsOResult(Collection value) {
     return value.stream().anyMatch(x -> x instanceof OResult);
   }