Merge pull request #64 from wollanup/develop

wollanup · web-flow · commit 47a13f740392 · 2019-01-31T09:59:45.000+01:00
fix(core): CROSS JOIN when nested relations due to duplicate alias
diff --git a/src/Service/QueryModifier/UseQuery/UseQueryFromDotNotation.php b/src/Service/QueryModifier/UseQuery/UseQueryFromDotNotation.php
@@ -131,7 +131,7 @@ public function useQuery($alias = null): ModelCriteria
                     $path = implode(self::RELATION_SEP, $this->map);
                     throw new RelationNotFoundException("Relation \"$relation\" Not Found in \"$path\"");
                 }
-                $this->query = call_user_func([$this->query, $method], $alias);
+                $this->query = call_user_func([$this->query, $method], $alias  . "_" . $relation);
             }
         }
         $this->inUse = true;

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public function useQuery($alias = null): ModelCriteria`
`131`	`131`	`$path = implode(self::RELATION_SEP, $this->map);`
`132`	`132`	`throw new RelationNotFoundException("Relation \"$relation\" Not Found in \"$path\"");`
`133`	`133`	`}`
`134`		`- $this->query = call_user_func([$this->query, $method], $alias);`
	`134`	`+ $this->query = call_user_func([$this->query, $method], $alias . "_" . $relation);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`$this->inUse = true;`