@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | $query->via($joinAlias); |
84 | 84 | |
85 | 85 | if ($this instanceof BelongsTo) { |
86 | - $joinOn = $name . '.' . $this->foreignKey . '=' . $joinAlias . '.' . $this->localKey; |
|
86 | + $joinOn = $name.'.'.$this->foreignKey.'='.$joinAlias.'.'.$this->localKey; |
|
87 | 87 | } else { |
88 | - $joinOn = $name . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey; |
|
88 | + $joinOn = $name.'.'.$this->localKey.'='.$joinAlias.'.'.$this->foreignKey; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | if ($closure instanceof Closure) { |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | } |
101 | 101 | |
102 | 102 | $query->join([$joinTable => $joinAlias], $joinOn, $joinType) |
103 | - ->field($field, false, $joinTable, $joinAlias, $relation . '__'); |
|
103 | + ->field($field, false, $joinTable, $joinAlias, $relation.'__'); |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | /** |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | foreach ($this->bindAttr as $key => $attr) { |
293 | 293 | $key = is_numeric($key) ? $attr : $key; |
294 | 294 | if (isset($result->$key)) { |
295 | - throw new Exception('bind attr has exists:' . $key); |
|
295 | + throw new Exception('bind attr has exists:'.$key); |
|
296 | 296 | } else { |
297 | 297 | $result->setAttr($key, $model ? $model->$attr : null); |
298 | 298 | } |