join conditions and alias

2015-11-27 12:21:40 +02:00
parent 59dccbedbd
commit dba325aa61
1 changed files with 6 additions and 3 deletions
@@ -693,17 +693,20 @@ abstract class Base
    {
        $joinsArr = array();
        foreach ($joins as $relationName) {
-            $joinAlias = null;
            if (is_array($relationName)) {
                $arr = $relationName;
                $relationName = $arr[0];
                if (count($arr) > 1) {
                    $joinAlias = $arr[1];
+                } else {
+                    $joinAlias = $relationName;
                }
+            } else {
+                $joinAlias = $relationName;
            }
            $conditions = array();
-            if (!empty($joinConditions[$relationName])) {
-                $conditions = $joinConditions[$relationName];
+            if (!empty($joinConditions[$joinAlias])) {
+                $conditions = $joinConditions[$joinAlias];
            }
            if ($joinRelated = $this->getJoinRelated($entity, $relationName, $left, $conditions, $joinAlias)) {
                $joinsArr[] = $joinRelated;