Make embeddables diggable

Author: ghost81

.gitignore

@@ -19,3 +19,9 @@ profiling/
 *.iws
 .idea/
 *uuid.state
+
+# Eclipse
+/**/.project
+/**/.classpath
+/**/.settings/
+/**/bin/

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -210,17 +210,31 @@ Object naturalKeyVal(Map<String, Object> values) {
   @Override
   public ElPropertyValue buildElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) {
     if (embedded) {
-      BeanProperty embProp = embeddedPropsMap.get(remainder);
+      String embName = remainder;
+      int basePos = remainder.indexOf('.');
+      if (basePos > -1) {
+        embName = remainder.substring(0, basePos);
+      }
+      BeanProperty embProp = embeddedPropsMap.get(embName);
       if (embProp == null) {
-        String msg = "Embedded Property " + remainder + " not found in " + fullName();
+        String msg = "Embedded Property " + embName + " not found in " + fullName();
         throw new PersistenceException(msg);
       }
+      
+      if (basePos == -1) {
+        // we set chain as embedded (and stop future processing)
+        // only if we not dig into one of the properties of the embeddable
+        if (chain == null) {
+          chain = new ElPropertyChainBuilder(true, propName);
+        }
+
+        chain.add(this);
+        chain.setEmbedded(true);
+        return chain.add(embProp).build();
+      }
       if (chain == null) {
-        chain = new ElPropertyChainBuilder(true, propName);
+        chain = new ElPropertyChainBuilder(false, propName);
       }
-      chain.add(this);
-      chain.setEmbedded(true);
-      return chain.add(embProp).build();
     }
     return createElPropertyValue(propName, remainder, chain, propertyDeploy);
   }

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java

@@ -35,7 +35,7 @@ final class SqlTreeAlias {
   void addManyWhereJoins(Set<String> manyWhereJoins) {
     if (manyWhereJoins != null) {
       for (String include : manyWhereJoins) {
-        addPropertyJoin(include, manyWhereJoinProps);
+        addPropertyJoin(include, manyWhereJoinProps, null);
       }
     }
   }
@@ -56,18 +56,22 @@ public void addJoin(Set<String> propJoins, STreeType desc) {
         if (desc.isEmbeddedPath(propJoin)) {
           addEmbeddedPropertyJoin(propJoin);
         } else {
-          addPropertyJoin(propJoin, joinProps);
+          addPropertyJoin(propJoin, joinProps, desc);
         }
       }
     }
   }
-
-  private void addPropertyJoin(String include, TreeSet<String> set) {
-    if (set.add(include)) {
-      String[] split = SplitName.split(include);
-      if (split[0] != null) {
-        addPropertyJoin(split[0], set);
-      }
+  
+  private void addPropertyJoin(String include, TreeSet<String> set, STreeType desc) {
+    if (include == null) {
+      return;
+    }
+    String[] split = SplitName.split(include);
+    if (desc != null && desc.isEmbeddedPath(include)) {
+      addEmbeddedPropertyJoin(include);
+      addPropertyJoin(split[0], set, desc);
+    } else if (set.add(include)) {
+      addPropertyJoin(split[0], set, desc);
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java

@@ -684,6 +684,12 @@ private SqlTreeNodeExtraJoin findExtraJoinRoot(String includeProp, SqlTreeNodeEx
 
           SqlTreeNodeExtraJoin parentJoin = joinRegister.get(parentPropertyName);
           if (parentJoin == null) {
+            if (desc.isEmbeddedPath(parentPropertyName)) {
+              // digging in embedded property
+              // so we have to join parent property path
+              includeProp = parentPropertyName;
+              continue;
+            }
             // we need to create this the parent implicitly...
             parentJoin = createJoinLeaf(parentPropertyName);
           }