top-think / framework

library/think/model/relation/HasOne.php

Spacing +9 added lines, -9 removed lines

@@ -89,7 +89,7 @@ 
         }
 
         return $this->query
-            ->whereExp($this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
+            ->whereExp($this->foreignKey, '='.$this->parent->getTable().'.'.$this->localKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -144,12 +144,12 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey, $softDelete) {
+            ->whereExists(function($query) use ($table, $model, $relation, $localKey, $foreignKey, $softDelete) {
                 $query->table([$table => $relation])
-                    ->field($relation . '.' . $foreignKey)
-                    ->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey)
-                    ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                        $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+                    ->field($relation.'.'.$foreignKey)
+                    ->whereExp($model.'.'.$localKey, '='.$relation.'.'.$foreignKey)
+                    ->when($softDelete, function($query) use ($softDelete, $relation) {
+                        $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
                     });
             });
     }
@@ -177,9 +177,9 @@ 
         return $this->parent->db()
             ->alias($model)
             ->field($fields)
-            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType)
-            ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey, $this->joinType)
+            ->when($softDelete, function($query) use ($softDelete, $relation) {
+                $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
             ->where($where);
     }