top-think / framework

library/think/model/relation/HasManyThrough.php

Spacing +24 added lines, -24 removed lines

@@ -89,19 +89,19 @@ 
         $softDelete    = $this->query->getOptions('soft_delete');
 
         if ('*' != $id) {
-            $id = $relationTable . '.' . $relation->getPk();
+            $id = $relationTable.'.'.$relation->getPk();
         }
 
         return $this->parent->db()
             ->alias($model)
-            ->field($model . '.*')
-            ->join($throughTable, $throughTable . '.' . $this->foreignKey . '=' . $model . '.' . $this->localKey)
-            ->join($relationTable, $relationTable . '.' . $throughKey . '=' . $throughTable . '.' . $this->throughPk)
-            ->when($softDelete, function ($query) use ($softDelete, $relationTable) {
-                $query->where($relationTable . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->field($model.'.*')
+            ->join($throughTable, $throughTable.'.'.$this->foreignKey.'='.$model.'.'.$this->localKey)
+            ->join($relationTable, $relationTable.'.'.$throughKey.'='.$throughTable.'.'.$this->throughPk)
+            ->when($softDelete, function($query) use ($softDelete, $relationTable) {
+                $query->where($relationTable.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
-            ->group($relationTable . '.' . $this->throughKey)
-            ->having('count(' . $id . ')' . $operator . $count);
+            ->group($relationTable.'.'.$this->throughKey)
+            ->having('count('.$id.')'.$operator.$count);
     }
 
     /**
@@ -128,12 +128,12 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->join($throughTable, $throughTable . '.' . $this->foreignKey . '=' . $model . '.' . $this->localKey)
-            ->join($modelTable, $modelTable . '.' . $throughKey . '=' . $throughTable . '.' . $this->throughPk)
-            ->when($softDelete, function ($query) use ($softDelete, $modelTable) {
-                $query->where($modelTable . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->join($throughTable, $throughTable.'.'.$this->foreignKey.'='.$model.'.'.$this->localKey)
+            ->join($modelTable, $modelTable.'.'.$throughKey.'='.$throughTable.'.'.$this->throughPk)
+            ->when($softDelete, function($query) use ($softDelete, $modelTable) {
+                $query->where($modelTable.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
-            ->group($modelTable . '.' . $this->throughKey)
+            ->group($modelTable.'.'.$this->throughKey)
             ->where($where)
             ->field($fields);
     }
@@ -285,14 +285,14 @@ 
         $modelTable   = $this->parent->getTable();
 
         if (false === strpos($field, '.')) {
-            $field = $alias . '.' . $field;
+            $field = $alias.'.'.$field;
         }
 
         return $this->query
             ->alias($alias)
-            ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
-            ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
-            ->where($throughTable . '.' . $this->foreignKey, $result->$localKey)
+            ->join($throughTable, $throughTable.'.'.$pk.'='.$alias.'.'.$throughKey)
+            ->join($modelTable, $modelTable.'.'.$this->localKey.'='.$throughTable.'.'.$this->foreignKey)
+            ->where($throughTable.'.'.$this->foreignKey, $result->$localKey)
             ->$aggregate($field);
     }
 
@@ -321,14 +321,14 @@ 
         $modelTable   = $this->parent->getTable();
 
         if (false === strpos($field, '.')) {
-            $field = $alias . '.' . $field;
+            $field = $alias.'.'.$field;
         }
 
         return $this->query
             ->alias($alias)
-            ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
-            ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
-            ->whereExp($throughTable . '.' . $this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
+            ->join($throughTable, $throughTable.'.'.$pk.'='.$alias.'.'.$throughKey)
+            ->join($modelTable, $modelTable.'.'.$this->localKey.'='.$throughTable.'.'.$this->foreignKey)
+            ->whereExp($throughTable.'.'.$this->foreignKey, '='.$this->parent->getTable().'.'.$this->localKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -351,9 +351,9 @@ 
             $this->query
                 ->field($fields)
                 ->alias($alias)
-                ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
-                ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
-                ->where($throughTable . '.' . $this->foreignKey, $this->parent->{$this->localKey});
+                ->join($throughTable, $throughTable.'.'.$pk.'='.$alias.'.'.$throughKey)
+                ->join($modelTable, $modelTable.'.'.$this->localKey.'='.$throughTable.'.'.$this->foreignKey)
+                ->where($throughTable.'.'.$this->foreignKey, $this->parent->{$this->localKey});
 
             $this->baseQuery = true;
         }