Fix nested projections on INSERT RETURN statement

Resolves: #8543
orientechnologies · Nov 27, 2018 · 14d6d1f · 14d6d1f
1 parent 615a9ce
commit 14d6d1f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OProjectionItem.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OProjectionItem.java
@@ -7,6 +7,7 @@
 import com.orientechnologies.orient.core.db.record.ridbag.ORidBag;
 import com.orientechnologies.orient.core.exception.OCommandExecutionException;
 import com.orientechnologies.orient.core.id.ORID;
+import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.record.impl.OEdgeToVertexIterable;
 import com.orientechnologies.orient.core.record.impl.OEdgeToVertexIterator;
 import com.orientechnologies.orient.core.sql.executor.AggregationContext;
@@ -140,6 +141,9 @@ public Object execute(OResult iCurrentRecord, OCommandContext ctx) {
  result = expression.execute(iCurrentRecord, ctx);
  }
  if (nestedProjection != null) {
+ if(result instanceof ODocument && ((ODocument) result).isEmpty()){
+ ((ODocument) result).load(null);
+ }
  result = nestedProjection.apply(expression, result, ctx);
  }
  return convert(result);