top-think / framework

library/think/db/Query.php

Spacing +41 added lines, -41 removed lines

@@ -189,15 +189,15 @@ 
             $name = Loader::parseName(substr($method, 5));
             array_unshift($args, $name);
             return call_user_func_array([$this, 'where'], $args);
-        } elseif ($this->model && method_exists($this->model, 'scope' . $method)) {
+        } elseif ($this->model && method_exists($this->model, 'scope'.$method)) {
             // 动态调用命名范围
-            $method = 'scope' . $method;
+            $method = 'scope'.$method;
             array_unshift($args, $this);
 
             call_user_func_array([$this->model, $method], $args);
             return $this;
         } else {
-            throw new Exception('method not exist:' . ($this->model ? get_class($this->model) : static::class) . '->' . $method);
+            throw new Exception('method not exist:'.($this->model ? get_class($this->model) : static::class).'->'.$method);
         }
     }
 
@@ -316,7 +316,7 @@ 
 
         $name = $name ?: $this->name;
 
-        return $this->prefix . Loader::parseName($name);
+        return $this->prefix.Loader::parseName($name);
     }
 
     /**
@@ -588,16 +588,16 @@ 
                     $seq = (ord(substr($value, 0, 1)) % $rule['num']) + 1;
             }
 
-            return $this->getTable() . '_' . $seq;
+            return $this->getTable().'_'.$seq;
         }
         // 当设置的分表字段不在查询条件或者数据中
         // 进行联合查询，必须设定 partition['num']
         $tableName = [];
         for ($i = 0; $i < $rule['num']; $i++) {
-            $tableName[] = 'SELECT * FROM ' . $this->getTable() . '_' . ($i + 1);
+            $tableName[] = 'SELECT * FROM '.$this->getTable().'_'.($i + 1);
         }
 
-        return ['( ' . implode(" UNION ", $tableName) . ' )' => $this->name];
+        return ['( '.implode(" UNION ", $tableName).' )' => $this->name];
     }
 
     /**
@@ -663,7 +663,7 @@ 
             // 支持GROUP
             $options = $this->getOptions();
             $subSql  = $this->options($options)
-                ->field('count(' . $field . ') AS think_count')
+                ->field('count('.$field.') AS think_count')
                 ->bind($this->bind)
                 ->buildSql();
 
@@ -766,7 +766,7 @@ 
 
         if ($lazyTime > 0) {
             // 延迟写入
-            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $guid = md5($this->getTable().'_'.$field.'_'.serialize($condition));
             $step = $this->lazyWrite('inc', $guid, $step, $lazyTime);
 
             if (false === $step) {
@@ -799,7 +799,7 @@ 
 
         if ($lazyTime > 0) {
             // 延迟写入
-            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $guid = md5($this->getTable().'_'.$field.'_'.serialize($condition));
             $step = $this->lazyWrite('dec', $guid, $step, $lazyTime);
 
             if (false === $step) {
@@ -830,15 +830,15 @@ 
     {
         $cache = Container::get('cache');
 
-        if (!$cache->has($guid . '_time')) {
+        if (!$cache->has($guid.'_time')) {
             // 计时开始
-            $cache->set($guid . '_time', time(), 0);
+            $cache->set($guid.'_time', time(), 0);
             $cache->$type($guid, $step);
-        } elseif (time() > $cache->get($guid . '_time') + $lazyTime) {
+        } elseif (time() > $cache->get($guid.'_time') + $lazyTime) {
             // 删除缓存
             $value = $cache->$type($guid, $step);
             $cache->rm($guid);
-            $cache->rm($guid . '_time');
+            $cache->rm($guid.'_time');
             return 0 === $value ? false : $value;
         } else {
             // 更新缓存
@@ -1037,10 +1037,10 @@ 
             $prefix = $prefix ?: $tableName;
             foreach ($field as $key => &$val) {
                 if (is_numeric($key) && $alias) {
-                    $field[$prefix . '.' . $val] = $alias . $val;
+                    $field[$prefix.'.'.$val] = $alias.$val;
                     unset($field[$key]);
                 } elseif (is_numeric($key)) {
-                    $val = $prefix . '.' . $val;
+                    $val = $prefix.'.'.$val;
                 }
             }
         }
@@ -1167,7 +1167,7 @@ 
             $table  = $this->getJoinTable($join, $alias);
 
             if (true === $field) {
-                $fields = $alias . '.*';
+                $fields = $alias.'.*';
             } else {
                 if (is_string($field)) {
                     $field = explode(',', $field);
@@ -1175,17 +1175,17 @@ 
 
                 foreach ($field as $key => $val) {
                     if (is_numeric($key)) {
-                        $fields[] = $alias . '.' . $val;
+                        $fields[] = $alias.'.'.$val;
 
-                        $this->options['map'][$val] = $alias . '.' . $val;
+                        $this->options['map'][$val] = $alias.'.'.$val;
                     } else {
                         if (preg_match('/[,=\.\'\"\(\s]/', $key)) {
                             $name = $key;
                         } else {
-                            $name = $alias . '.' . $key;
+                            $name = $alias.'.'.$key;
                         }
 
-                        $fields[] = $name . ' AS ' . $val;
+                        $fields[] = $name.' AS '.$val;
 
                         $this->options['map'][$val] = $name;
                     }
@@ -1498,9 +1498,9 @@ 
             }
 
             if (is_numeric($key)) {
-                $sql = substr_replace($sql, ':' . $name, strpos($sql, '?'), 1);
+                $sql = substr_replace($sql, ':'.$name, strpos($sql, '?'), 1);
             } else {
-                $sql = str_replace(':' . $key, ':' . $name, $sql);
+                $sql = str_replace(':'.$key, ':'.$name, $sql);
             }
         }
     }
@@ -1544,7 +1544,7 @@ 
         }
 
         if (is_string($field) && !empty($this->options['via']) && false === strpos($field, '.')) {
-            $field = $this->options['via'] . '.' . $field;
+            $field = $this->options['via'].'.'.$field;
         }
 
         if ($field instanceof Expression) {
@@ -1728,7 +1728,7 @@ 
             list($offset, $length) = explode(',', $offset);
         }
 
-        $this->options['limit'] = intval($offset) . ($length ? ',' . intval($length) : '');
+        $this->options['limit'] = intval($offset).($length ? ','.intval($length) : '');
 
         return $this;
     }
@@ -1785,7 +1785,7 @@ 
         }
 
         /** @var Paginator $class */
-        $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\paginator\\driver\\' . ucwords($config['type']);
+        $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\paginator\\driver\\'.ucwords($config['type']);
         $page  = isset($config['page']) ? (int) $config['page'] : call_user_func([
             $class,
             'getCurrentPage',
@@ -1895,7 +1895,7 @@ 
 
         if (is_string($field)) {
             if (!empty($this->options['via'])) {
-                $field = $this->options['via'] . '.' . $field;
+                $field = $this->options['via'].'.'.$field;
             }
 
             if (strpos($field, ',')) {
@@ -1906,9 +1906,9 @@ 
         } elseif (!empty($this->options['via'])) {
             foreach ($field as $key => $val) {
                 if (is_numeric($key)) {
-                    $field[$key] = $this->options['via'] . '.' . $val;
+                    $field[$key] = $this->options['via'].'.'.$val;
                 } else {
-                    $field[$this->options['via'] . '.' . $key] = $val;
+                    $field[$this->options['via'].'.'.$key] = $val;
                     unset($field[$key]);
                 }
             }
@@ -2320,7 +2320,7 @@ 
         if ($this->model) {
             // 检查模型类的查询范围方法
             foreach ($scope as $name) {
-                $method = 'scope' . trim($name);
+                $method = 'scope'.trim($name);
 
                 if (method_exists($this->model, $method)) {
                     call_user_func_array([$this->model, $method], $args);
@@ -2347,7 +2347,7 @@ 
             } elseif ($this->model) {
                 // 检测搜索器
                 $fieldName = is_numeric($key) ? $field : $key;
-                $method    = 'search' . Loader::parseName($fieldName, 1) . 'Attr';
+                $method    = 'search'.Loader::parseName($fieldName, 1).'Attr';
 
                 if (method_exists($this->model, $method)) {
                     $this->model->$method($this, isset($data[$field]) ? $data[$field] : null, $data, $prefix);
@@ -2412,7 +2412,7 @@ 
             $op = is_array($range) ? 'between' : '>=';
         }
 
-        return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true);
+        return $this->parseWhereExp($logic, $field, strtolower($op).' time', $range, [], true);
     }
 
     /**
@@ -2490,7 +2490,7 @@ 
         if (is_array($value)) {
             $this->bind = array_merge($this->bind, $value);
         } else {
-            $name = $name ?: 'ThinkBind_' . (count($this->bind) + 1) . '_' . mt_rand() . '_';
+            $name = $name ?: 'ThinkBind_'.(count($this->bind) + 1).'_'.mt_rand().'_';
 
             $this->bind[$name] = [$value, $type];
             return $name;
@@ -2707,10 +2707,10 @@ 
                 $count = $this->model->$relation()->getRelationCountQuery($closure, $aggregate, $field, $aggregateField);
 
                 if (empty($aggregateField)) {
-                    $aggregateField = Loader::parseName($relation) . '_' . $aggregate;
+                    $aggregateField = Loader::parseName($relation).'_'.$aggregate;
                 }
 
-                $this->field(['(' . $count . ')' => $aggregateField]);
+                $this->field(['('.$count.')' => $aggregateField]);
             }
         }
 
@@ -3429,10 +3429,10 @@ 
     {
         if (!empty($this->model)) {
             $class = get_class($this->model);
-            throw new ModelNotFoundException('model data Not Found:' . $class, $class, $options);
+            throw new ModelNotFoundException('model data Not Found:'.$class, $class, $options);
         }
         $table = is_array($options['table']) ? key($options['table']) : $options['table'];
-        throw new DataNotFoundException('table data not Found:' . $table, $table, $options);
+        throw new DataNotFoundException('table data not Found:'.$table, $table, $options);
     }
 
     /**
@@ -3568,7 +3568,7 @@ 
      */
     public function buildSql($sub = true)
     {
-        return $sub ? '( ' . $this->select(false) . ' )' : $this->select(false);
+        return $sub ? '( '.$this->select(false).' )' : $this->select(false);
     }
 
     /**
@@ -3639,7 +3639,7 @@ 
         }
 
         if (is_string($pk)) {
-            $key = isset($alias) ? $alias . '.' . $pk : $pk;
+            $key = isset($alias) ? $alias.'.'.$pk : $pk;
             // 根据主键查询
             if (is_array($data)) {
                 $where[$pk] = isset($data[$pk]) ? [$key, '=', $data[$pk]] : [$key, 'in', $data];
@@ -3650,7 +3650,7 @@ 
             // 根据复合主键查询
             foreach ($pk as $key) {
                 if (isset($data[$key])) {
-                    $attr        = isset($alias) ? $alias . '.' . $key : $key;
+                    $attr        = isset($alias) ? $alias.'.'.$key : $key;
                     $where[$key] = [$attr, '=', $data[$key]];
                 } else {
                     throw new Exception('miss complex primary data');
@@ -3726,7 +3726,7 @@ 
             $page                  = $page > 0 ? $page : 1;
             $listRows              = $listRows > 0 ? $listRows : (is_numeric($options['limit']) ? $options['limit'] : 20);
             $offset                = $listRows * ($page - 1);
-            $options['limit']      = $offset . ',' . $listRows;
+            $options['limit']      = $offset.','.$listRows;
         }
 
         $this->options = $options;