Fix nested projections with nested star

Resolves: #8662
orientechnologies · Nov 16, 2018 · 9656bea · 9656bea
1 parent 50a5366
commit 9656bea
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ONestedProjection.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ONestedProjection.java
@@ -16,8 +16,8 @@
 public class ONestedProjection extends SimpleNode {
   protected List<ONestedProjectionItem> includeItems = new ArrayList<>();
   protected List<ONestedProjectionItem> excludeItems = new ArrayList<>();
-  protected ONestedProjectionItem starItem;
-  private   OInteger              recursion; //not used for now
+  protected ONestedProjectionItem       starItem;
+  private   OInteger                    recursion; //not used for now
 
   public ONestedProjection(int id) {
     super(id);
@@ -96,6 +96,9 @@ private boolean isExclude(String propertyName) {
   }
 
   private Object tryExpand(OExpression rootExpr, String propName, Object propValue, OCommandContext ctx, int recursion) {
+    if (this.starItem != null && starItem.expansion != null) {
+      return starItem.expand(rootExpr, propName, propValue, ctx, recursion);
+    }
     for (ONestedProjectionItem item : includeItems) {
       if (item.matches(propName) && item.expansion != null) {
         return item.expand(rootExpr, propName, propValue, ctx, recursion);