top-think / framework

library/think/model/relation/HasMany.php

Spacing +8 added lines, -8 removed lines

@@ -194,8 +194,8 @@ 
             }
         }
 
-        return $this->query->alias($aggregate . '_table')
-            ->whereExp($aggregate . '_table.' . $this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
+        return $this->query->alias($aggregate.'_table')
+            ->whereExp($aggregate.'_table.'.$this->foreignKey, '='.$this->parent->getTable().'.'.$this->localKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -298,10 +298,10 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->field($model . '.*')
-            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType)
-            ->group($relation . '.' . $this->foreignKey)
-            ->having('count(' . $id . ')' . $operator . $count);
+            ->field($model.'.*')
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey, $joinType)
+            ->group($relation.'.'.$this->foreignKey)
+            ->having('count('.$id.')'.$operator.$count);
     }
 
     /**
@@ -325,9 +325,9 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->group($model . '.' . $this->localKey)
+            ->group($model.'.'.$this->localKey)
             ->field($fields)
-            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey)
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey)
             ->where($where);
     }
 

library/think/exception/ThrowableError.php

Spacing +3 added lines, -3 removed lines

@@ -17,13 +17,13 @@
     {
 
         if ($e instanceof \ParseError) {
-            $message  = 'Parse error: ' . $e->getMessage();
+            $message  = 'Parse error: '.$e->getMessage();
             $severity = E_PARSE;
         } elseif ($e instanceof \TypeError) {
-            $message  = 'Type error: ' . $e->getMessage();
+            $message  = 'Type error: '.$e->getMessage();
             $severity = E_RECOVERABLE_ERROR;
         } else {
-            $message  = 'Fatal error: ' . $e->getMessage();
+            $message  = 'Fatal error: '.$e->getMessage();
             $severity = E_ERROR;
         }
 

library/think/exception/Handle.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
             }
 
             if (Container::get('app')->config('log.record_trace')) {
-                $log .= "\r\n" . $exception->getTraceAsString();
+                $log .= "\r\n".$exception->getTraceAsString();
             }
 
             Container::get('log')->record($log, 'error');
@@ -237,10 +237,10 @@ 
 
         if (strpos($message, ':')) {
             $name    = strstr($message, ':', true);
-            $message = $lang->has($name) ? $lang->get($name) . strstr($message, ':') : $message;
+            $message = $lang->has($name) ? $lang->get($name).strstr($message, ':') : $message;
         } elseif (strpos($message, ',')) {
             $name    = strstr($message, ',', true);
-            $message = $lang->has($name) ? $lang->get($name) . ':' . substr(strstr($message, ','), 1) : $message;
+            $message = $lang->has($name) ? $lang->get($name).':'.substr(strstr($message, ','), 1) : $message;
         } elseif ($lang->has($message)) {
             $message = $lang->get($message);
         }

library/think/db/Query.php

Spacing +41 added lines, -41 removed lines

@@ -169,15 +169,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);
         }
     }
 
@@ -296,7 +296,7 @@ 
 
         $name = $name ?: $this->name;
 
-        return $this->prefix . Loader::parseName($name);
+        return $this->prefix.Loader::parseName($name);
     }
 
     /**
@@ -568,16 +568,16 @@ 
                         $seq = (ord($value{0}) % $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];
     }
 
     /**
@@ -643,7 +643,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();
 
@@ -746,7 +746,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) {
@@ -779,7 +779,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) {
@@ -810,15 +810,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 {
             // 更新缓存
@@ -1017,10 +1017,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;
                 }
             }
         }
@@ -1147,7 +1147,7 @@ 
             $table  = $this->getJoinTable($join, $alias);
 
             if (true === $field) {
-                $fields = $alias . '.*';
+                $fields = $alias.'.*';
             } else {
                 if (is_string($field)) {
                     $field = explode(',', $field);
@@ -1155,17 +1155,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;
                     }
@@ -1478,9 +1478,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);
             }
         }
     }
@@ -1524,7 +1524,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) {
@@ -1708,7 +1708,7 @@ 
             list($offset, $length) = explode(',', $offset);
         }
 
-        $this->options['limit'] = intval($offset) . ($length ? ',' . intval($length) : '');
+        $this->options['limit'] = intval($offset).($length ? ','.intval($length) : '');
 
         return $this;
     }
@@ -1765,7 +1765,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',
@@ -1875,7 +1875,7 @@ 
 
         if (is_string($field)) {
             if (!empty($this->options['via'])) {
-                $field = $this->options['via'] . '.' . $field;
+                $field = $this->options['via'].'.'.$field;
             }
 
             if (strpos($field, ',')) {
@@ -1886,9 +1886,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]);
                 }
             }
@@ -2300,7 +2300,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);
@@ -2327,7 +2327,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);
@@ -2392,7 +2392,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);
     }
 
     /**
@@ -2470,7 +2470,7 @@ 
         if (is_array($value)) {
             $this->bind = array_merge($this->bind, $value);
         } else {
-            $name = $name ?: 'ThinkBind_' . (count($this->bind) + 1) . '_';
+            $name = $name ?: 'ThinkBind_'.(count($this->bind) + 1).'_';
 
             $this->bind[$name] = [$value, $type];
             return $name;
@@ -2687,10 +2687,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]);
             }
         }
 
@@ -3409,10 +3409,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);
     }
 
     /**
@@ -3548,7 +3548,7 @@ 
      */
     public function buildSql($sub = true)
     {
-        return $sub ? '( ' . $this->select(false) . ' )' : $this->select(false);
+        return $sub ? '( '.$this->select(false).' )' : $this->select(false);
     }
 
     /**
@@ -3619,7 +3619,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];
@@ -3630,7 +3630,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');
@@ -3706,7 +3706,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;

library/think/db/builder/Sqlsrv.php

Spacing +11 added lines, -11 removed lines

@@ -48,22 +48,22 @@ 
                 $array[] = $this->parseRand($query);
             } else {
                 if (is_numeric($key)) {
-                    list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' ');
+                    list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val.' ');
                 } else {
                     $sort = $val;
                 }
 
                 if (preg_match('/^[\w\.]+$/', $key)) {
                     $sort    = strtoupper($sort);
-                    $sort    = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
-                    $array[] = $this->parseKey($query, $key, true) . $sort;
+                    $sort    = in_array($sort, ['ASC', 'DESC'], true) ? ' '.$sort : '';
+                    $array[] = $this->parseKey($query, $key, true).$sort;
                 } else {
-                    throw new Exception('order express error:' . $key);
+                    throw new Exception('order express error:'.$key);
                 }
             }
         }
 
-        return empty($array) ? '' : ' ORDER BY ' . implode(',', $array);
+        return empty($array) ? '' : ' ORDER BY '.implode(',', $array);
     }
 
     /**
@@ -111,15 +111,15 @@ 
         }
 
         if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) {
-            throw new Exception('not support data:' . $key);
+            throw new Exception('not support data:'.$key);
         }
 
         if ('*' != $key && !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) {
-            $key = '[' . $key . ']';
+            $key = '['.$key.']';
         }
 
         if (isset($table)) {
-            $key = '[' . $table . '].' . $key;
+            $key = '['.$table.'].'.$key;
         }
 
         return $key;
@@ -141,12 +141,12 @@ 
         $limit = explode(',', $limit);
 
         if (count($limit) > 1) {
-            $limitStr = '(T1.ROW_NUMBER BETWEEN ' . $limit[0] . ' + 1 AND ' . $limit[0] . ' + ' . $limit[1] . ')';
+            $limitStr = '(T1.ROW_NUMBER BETWEEN '.$limit[0].' + 1 AND '.$limit[0].' + '.$limit[1].')';
         } else {
-            $limitStr = '(T1.ROW_NUMBER BETWEEN 1 AND ' . $limit[0] . ")";
+            $limitStr = '(T1.ROW_NUMBER BETWEEN 1 AND '.$limit[0].")";
         }
 
-        return 'WHERE ' . $limitStr;
+        return 'WHERE '.$limitStr;
     }
 
     public function selectInsert(Query $query, $fields, $table)

library/think/db/builder/Sqlite.php

Spacing +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@ 
         if (!empty($limit)) {
             $limit = explode(',', $limit);
             if (count($limit) > 1) {
-                $limitStr .= ' LIMIT ' . $limit[1] . ' OFFSET ' . $limit[0] . ' ';
+                $limitStr .= ' LIMIT '.$limit[1].' OFFSET '.$limit[0].' ';
             } else {
-                $limitStr .= ' LIMIT ' . $limit[0] . ' ';
+                $limitStr .= ' LIMIT '.$limit[0].' ';
             }
         }
 
@@ -88,7 +88,7 @@ 
         }
 
         if (isset($table)) {
-            $key = $table . '.' . $key;
+            $key = $table.'.'.$key;
         }
 
         return $key;

library/think/db/builder/Mysql.php

Spacing +7 added lines, -7 removed lines

@@ -62,9 +62,9 @@ 
         $bind = $this->connection->getFieldsBind($options['table']);
 
         foreach ($dataSet as $k => $data) {
-            $data = $this->parseData($query, $data, $allowFields, $bind, '_' . $k);
+            $data = $this->parseData($query, $data, $allowFields, $bind, '_'.$k);
 
-            $values[] = '( ' . implode(',', array_values($data)) . ' )';
+            $values[] = '( '.implode(',', array_values($data)).' )';
 
             if (!isset($insertFields)) {
                 $insertFields = array_keys($data);
@@ -104,7 +104,7 @@ 
             $value = $value->getValue();
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -129,7 +129,7 @@ 
             // JSON字段支持
             list($field, $name) = explode('->', $key, 2);
 
-            return 'json_extract(' . $this->parseKey($query, $field, true) . ', \'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->', '.', $name) . '\')';
+            return 'json_extract('.$this->parseKey($query, $field, true).', \'$'.(strpos($name, '[') === 0 ? '' : '.').str_replace('->', '.', $name).'\')';
         } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
             list($table, $key) = explode('.', $key, 2);
 
@@ -146,11 +146,11 @@ 
         }
 
         if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) {
-            throw new Exception('not support data:' . $key);
+            throw new Exception('not support data:'.$key);
         }
 
         if ('*' != $key && !preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {
-            $key = '`' . $key . '`';
+            $key = '`'.$key.'`';
         }
 
         if (isset($table)) {
@@ -158,7 +158,7 @@ 
                 $table = str_replace('.', '`.`', $table);
             }
 
-            $key = '`' . $table . '`.' . $key;
+            $key = '`'.$table.'`.'.$key;
         }
 
         return $key;

library/think/db/builder/Pgsql.php

Spacing +4 added lines, -4 removed lines

@@ -37,9 +37,9 @@ 
         if (!empty($limit)) {
             $limit = explode(',', $limit);
             if (count($limit) > 1) {
-                $limitStr .= ' LIMIT ' . $limit[1] . ' OFFSET ' . $limit[0] . ' ';
+                $limitStr .= ' LIMIT '.$limit[1].' OFFSET '.$limit[0].' ';
             } else {
-                $limitStr .= ' LIMIT ' . $limit[0] . ' ';
+                $limitStr .= ' LIMIT '.$limit[0].' ';
             }
         }
 
@@ -67,7 +67,7 @@ 
         if (strpos($key, '->') && false === strpos($key, '(')) {
             // JSON字段支持
             list($field, $name) = explode('->', $key);
-            $key                = $field . '->>\'' . $name . '\'';
+            $key                = $field.'->>\''.$name.'\'';
         } elseif (strpos($key, '.')) {
             list($table, $key) = explode('.', $key, 2);
 
@@ -84,7 +84,7 @@ 
         }
 
         if (isset($table)) {
-            $key = $table . '.' . $key;
+            $key = $table.'.'.$key;
         }
 
         return $key;

library/think/db/Builder.php

Spacing +63 added lines, -63 removed lines

@@ -132,23 +132,23 @@ 
             if (false !== strpos($key, '->')) {
                 list($key, $name) = explode('->', $key);
                 $item             = $this->parseKey($query, $key);
-                $result[$item]    = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key, $val, $bind) . ')';
+                $result[$item]    = 'json_set('.$item.', \'$.'.$name.'\', '.$this->parseDataBind($query, $key, $val, $bind).')';
             } elseif ('*' == $options['field'] && false === strpos($key, '.') && !in_array($key, $fields, true)) {
                 if ($options['strict']) {
-                    throw new Exception('fields not exists:[' . $key . ']');
+                    throw new Exception('fields not exists:['.$key.']');
                 }
             } elseif (is_null($val)) {
                 $result[$item] = 'NULL';
             } elseif (is_array($val) && !empty($val)) {
                 switch (strtoupper($val[0])) {
                     case 'INC':
-                        $result[$item] = $item . ' + ' . floatval($val[1]);
+                        $result[$item] = $item.' + '.floatval($val[1]);
                         break;
                     case 'DEC':
-                        $result[$item] = $item . ' - ' . floatval($val[1]);
+                        $result[$item] = $item.' - '.floatval($val[1]);
                         break;
                     case 'EXP':
-                        throw new Exception('not support data:[' . $val[0] . ']');
+                        throw new Exception('not support data:['.$val[0].']');
                 }
             } elseif (is_scalar($val)) {
                 // 过滤非标量数据
@@ -176,7 +176,7 @@ 
 
         $name = $query->bind($data, isset($bind[$key]) ? $bind[$key] : PDO::PARAM_STR);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -209,7 +209,7 @@ 
 
             foreach ($fields as $key => $field) {
                 if (!is_numeric($key)) {
-                    $array[] = $this->parseKey($query, $key) . ' AS ' . $this->parseKey($query, $field, true);
+                    $array[] = $this->parseKey($query, $key).' AS '.$this->parseKey($query, $field, true);
                 } else {
                     $array[] = $this->parseKey($query, $field);
                 }
@@ -236,12 +236,12 @@ 
         foreach ((array) $tables as $key => $table) {
             if (!is_numeric($key)) {
                 $key    = $this->connection->parseSqlTable($key);
-                $item[] = $this->parseKey($query, $key) . ' ' . $this->parseKey($query, $table);
+                $item[] = $this->parseKey($query, $key).' '.$this->parseKey($query, $table);
             } else {
                 $table = $this->connection->parseSqlTable($table);
 
                 if (isset($options['alias'][$table])) {
-                    $item[] = $this->parseKey($query, $table) . ' ' . $this->parseKey($query, $options['alias'][$table]);
+                    $item[] = $this->parseKey($query, $table).' '.$this->parseKey($query, $options['alias'][$table]);
                 } else {
                     $item[] = $this->parseKey($query, $table);
                 }
@@ -268,11 +268,11 @@ 
             list($field, $condition) = $options['soft_delete'];
 
             $binds    = $this->connection->getFieldsBind($options['table']);
-            $whereStr = $whereStr ? '( ' . $whereStr . ' ) AND ' : '';
-            $whereStr = $whereStr . $this->parseWhereItem($query, $field, $condition, '', $binds);
+            $whereStr = $whereStr ? '( '.$whereStr.' ) AND ' : '';
+            $whereStr = $whereStr.$this->parseWhereItem($query, $field, $condition, '', $binds);
         }
 
-        return empty($whereStr) ? '' : ' WHERE ' . $whereStr;
+        return empty($whereStr) ? '' : ' WHERE '.$whereStr;
     }
 
     /**
@@ -296,17 +296,17 @@ 
 
             foreach ($val as $value) {
                 if ($value instanceof Expression) {
-                    $str[] = ' ' . $logic . ' ( ' . $value->getValue() . ' )';
+                    $str[] = ' '.$logic.' ( '.$value->getValue().' )';
                     continue;
                 }
 
                 if (is_array($value)) {
                     if (key($value) !== 0) {
-                        throw new Exception('where express error:' . var_export($value, true));
+                        throw new Exception('where express error:'.var_export($value, true));
                     }
                     $field = array_shift($value);
                 } elseif (!($value instanceof \Closure)) {
-                    throw new Exception('where express error:' . var_export($value, true));
+                    throw new Exception('where express error:'.var_export($value, true));
                 }
 
                 if ($value instanceof \Closure) {
@@ -316,7 +316,7 @@ 
                     $whereClause = $this->buildWhere($query, $newQuery->getOptions('where'));
 
                     if (!empty($whereClause)) {
-                        $str[] = ' ' . $logic . ' ( ' . $whereClause . ' )';
+                        $str[] = ' '.$logic.' ( '.$whereClause.' )';
                     }
                 } elseif (is_array($field)) {
                     array_unshift($value, $field);
@@ -325,7 +325,7 @@ 
                         $str2[] = $this->parseWhereItem($query, array_shift($item), $item, $logic, $binds);
                     }
 
-                    $str[] = ' ' . $logic . ' ( ' . implode(' AND ', $str2) . ' )';
+                    $str[] = ' '.$logic.' ( '.implode(' AND ', $str2).' )';
                 } elseif (strpos($field, '|')) {
                     // 不同字段使用相同查询条件（OR）
                     $array = explode('|', $field);
@@ -335,7 +335,7 @@ 
                         $item[] = $this->parseWhereItem($query, $k, $value, '', $binds);
                     }
 
-                    $str[] = ' ' . $logic . ' ( ' . implode(' OR ', $item) . ' )';
+                    $str[] = ' '.$logic.' ( '.implode(' OR ', $item).' )';
                 } elseif (strpos($field, '&')) {
                     // 不同字段使用相同查询条件（AND）
                     $array = explode('&', $field);
@@ -345,11 +345,11 @@ 
                         $item[] = $this->parseWhereItem($query, $k, $value, '', $binds);
                     }
 
-                    $str[] = ' ' . $logic . ' ( ' . implode(' AND ', $item) . ' )';
+                    $str[] = ' '.$logic.' ( '.implode(' AND ', $item).' )';
                 } else {
                     // 对字段使用表达式查询
                     $field = is_string($field) ? $field : '';
-                    $str[] = ' ' . $logic . ' ' . $this->parseWhereItem($query, $field, $value, $logic, $binds);
+                    $str[] = ' '.$logic.' '.$this->parseWhereItem($query, $field, $value, $logic, $binds);
                 }
             }
 
@@ -387,7 +387,7 @@ 
                 $str[] = $this->parseWhereItem($query, $field, $item, $rule, $binds);
             }
 
-            return '( ' . implode(' ' . $rule . ' ', $str) . ' )';
+            return '( '.implode(' '.$rule.' ', $str).' )';
         }
 
         // 检测操作符
@@ -414,7 +414,7 @@ 
             if (0 === strpos($value, ':') && $query->isBind(substr($value, 1))) {
             } else {
                 $name  = $query->bind($value, $bindType);
-                $value = ':' . $name;
+                $value = ':'.$name;
             }
         }
 
@@ -427,7 +427,7 @@ 
         }
 
         if (!isset($whereStr)) {
-            throw new Exception('where express error:' . $exp);
+            throw new Exception('where express error:'.$exp);
         }
 
         return $whereStr;
@@ -451,12 +451,12 @@ 
         if (is_array($value)) {
             foreach ($value as $item) {
                 $name    = $query->bind($item, PDO::PARAM_STR);
-                $array[] = $key . ' ' . $exp . ' :' . $name;
+                $array[] = $key.' '.$exp.' :'.$name;
             }
 
-            $whereStr = '(' . implode(' ' . strtoupper($logic) . ' ', $array) . ')';
+            $whereStr = '('.implode(' '.strtoupper($logic).' ', $array).')';
         } else {
-            $whereStr = $key . ' ' . $exp . ' ' . $value;
+            $whereStr = $key.' '.$exp.' '.$value;
         }
 
         return $whereStr;
@@ -479,10 +479,10 @@ 
         list($op, $field2) = $value;
 
         if (!in_array($op, ['=', '<>', '>', '>=', '<', '<='])) {
-            throw new Exception('where express error:' . var_export($value, true));
+            throw new Exception('where express error:'.var_export($value, true));
         }
 
-        return '( ' . $key . ' ' . $op . ' ' . $this->parseKey($query, $field2, true) . ' )';
+        return '( '.$key.' '.$op.' '.$this->parseKey($query, $field2, true).' )';
     }
 
     /**
@@ -499,7 +499,7 @@ 
     protected function parseExp(Query $query, $key, $exp, Expression $value, $field, $bindType)
     {
         // 表达式查询
-        return '( ' . $key . ' ' . $value->getValue() . ' )';
+        return '( '.$key.' '.$value->getValue().' )';
     }
 
     /**
@@ -516,7 +516,7 @@ 
     protected function parseNull(Query $query, $key, $exp, $value, $field, $bindType)
     {
         // NULL 查询
-        return $key . ' IS ' . $exp;
+        return $key.' IS '.$exp;
     }
 
     /**
@@ -538,7 +538,7 @@ 
         $min = $query->bind($data[0], $bindType);
         $max = $query->bind($data[1], $bindType);
 
-        return $key . ' ' . $exp . ' :' . $min . ' AND :' . $max . ' ';
+        return $key.' '.$exp.' :'.$min.' AND :'.$max.' ';
     }
 
     /**
@@ -560,10 +560,10 @@ 
         } elseif ($value instanceof Expression) {
             $value = $value->getValue();
         } else {
-            throw new Exception('where express error:' . $value);
+            throw new Exception('where express error:'.$value);
         }
 
-        return $exp . ' (' . $value . ')';
+        return $exp.' ('.$value.')';
     }
 
     /**
@@ -579,7 +579,7 @@ 
      */
     protected function parseTime(Query $query, $key, $exp, $value, $field, $bindType)
     {
-        return $key . ' ' . substr($exp, 0, 2) . ' ' . $this->parseDateTime($query, $value, $field, $bindType);
+        return $key.' '.substr($exp, 0, 2).' '.$this->parseDateTime($query, $value, $field, $bindType);
     }
 
     /**
@@ -596,7 +596,7 @@ 
     protected function parseCompare(Query $query, $key, $exp, $value, $field, $bindType)
     {
         if (is_array($value)) {
-            throw new Exception('where express error:' . $exp . var_export($value, true));
+            throw new Exception('where express error:'.$exp.var_export($value, true));
         }
 
         // 比较运算
@@ -605,10 +605,10 @@ 
         }
 
         if ('=' == $exp && is_null($value)) {
-            return $key . ' IS NULL';
+            return $key.' IS NULL';
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -628,7 +628,7 @@ 
             $value = explode(',', $value);
         }
 
-        return $key . ' ' . substr($exp, 0, -4)
+        return $key.' '.substr($exp, 0, -4)
         . $this->parseDateTime($query, $value[0], $field, $bindType)
         . ' AND '
         . $this->parseDateTime($query, $value[1], $field, $bindType);
@@ -659,18 +659,18 @@ 
 
             foreach ($value as $k => $v) {
                 $name    = $query->bind($v, $bindType);
-                $array[] = ':' . $name;
+                $array[] = ':'.$name;
             }
 
             if (count($array) == 1) {
-                return $key . ('IN' == $exp ? ' = ' : ' <> ') . $array[0];
+                return $key.('IN' == $exp ? ' = ' : ' <> ').$array[0];
             } else {
                 $zone  = implode(',', $array);
                 $value = empty($zone) ? "''" : $zone;
             }
         }
 
-        return $key . ' ' . $exp . ' (' . $value . ')';
+        return $key.' '.$exp.' ('.$value.')';
     }
 
     /**
@@ -735,7 +735,7 @@ 
 
         $name = $query->bind($value, $bindType);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -747,7 +747,7 @@ 
      */
     protected function parseLimit(Query $query, $limit)
     {
-        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT ' . $limit . ' ' : '';
+        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT '.$limit.' ' : '';
     }
 
     /**
@@ -773,7 +773,7 @@ 
                     } elseif (strpos($val, '=')) {
                         list($val1, $val2) = explode('=', $val, 2);
 
-                        $condition[] = $this->parseKey($query, $val1) . '=' . $this->parseKey($query, $val2);
+                        $condition[] = $this->parseKey($query, $val1).'='.$this->parseKey($query, $val2);
                     } else {
                         $condition[] = $val;
                     }
@@ -781,7 +781,7 @@ 
 
                 $table = $this->parseTable($query, $table);
 
-                $joinStr .= ' ' . $type . ' JOIN ' . $table . ' ON ' . implode(' AND ', $condition);
+                $joinStr .= ' '.$type.' JOIN '.$table.' ON '.implode(' AND ', $condition);
             }
         }
 
@@ -806,22 +806,22 @@ 
                 $array[] = $this->parseRand($query);
             } elseif (is_string($val)) {
                 if (is_numeric($key)) {
-                    list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' ');
+                    list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val.' ');
                 } else {
                     $sort = $val;
                 }
 
                 if (preg_match('/^[\w\.]+$/', $key)) {
                     $sort    = strtoupper($sort);
-                    $sort    = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
-                    $array[] = $this->parseKey($query, $key, true) . $sort;
+                    $sort    = in_array($sort, ['ASC', 'DESC'], true) ? ' '.$sort : '';
+                    $array[] = $this->parseKey($query, $key, true).$sort;
                 } else {
-                    throw new Exception('order express error:' . $key);
+                    throw new Exception('order express error:'.$key);
                 }
             }
         }
 
-        return empty($array) ? '' : ' ORDER BY ' . implode(',', $array);
+        return empty($array) ? '' : ' ORDER BY '.implode(',', $array);
     }
 
     /**
@@ -842,7 +842,7 @@ 
         }
 
         $sort = strtoupper($sort);
-        $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
+        $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' '.$sort : '';
 
         $options = $query->getOptions();
         $bind    = $this->connection->getFieldsBind($options['table']);
@@ -851,7 +851,7 @@ 
             $val[$k] = $this->parseDataBind($query, $key, $item, $bind);
         }
 
-        return 'field(' . $this->parseKey($query, $key, true) . ',' . implode(',', $val) . ')' . $sort;
+        return 'field('.$this->parseKey($query, $key, true).','.implode(',', $val).')'.$sort;
     }
 
     /**
@@ -875,7 +875,7 @@ 
             $val[] = $this->parseKey($query, $key);
         }
 
-        return ' GROUP BY ' . implode(',', $val);
+        return ' GROUP BY '.implode(',', $val);
     }
 
     /**
@@ -887,7 +887,7 @@ 
      */
     protected function parseHaving(Query $query, $having)
     {
-        return !empty($having) ? ' HAVING ' . $having : '';
+        return !empty($having) ? ' HAVING '.$having : '';
     }
 
     /**
@@ -903,7 +903,7 @@ 
             $comment = strstr($comment, '*/', true);
         }
 
-        return !empty($comment) ? ' /* ' . $comment . ' */' : '';
+        return !empty($comment) ? ' /* '.$comment.' */' : '';
     }
 
     /**
@@ -936,13 +936,13 @@ 
 
         foreach ($union as $u) {
             if ($u instanceof \Closure) {
-                $sql[] = $type . ' ' . $this->parseClosure($query, $u);
+                $sql[] = $type.' '.$this->parseClosure($query, $u);
             } elseif (is_string($u)) {
-                $sql[] = $type . ' ( ' . $this->connection->parseSqlTable($u) . ' )';
+                $sql[] = $type.' ( '.$this->connection->parseSqlTable($u).' )';
             }
         }
 
-        return ' ' . implode(' ', $sql);
+        return ' '.implode(' ', $sql);
     }
 
     /**
@@ -973,7 +973,7 @@ 
         if (is_bool($lock)) {
             return $lock ? ' FOR UPDATE ' : '';
         } elseif (is_string($lock) && !empty($lock)) {
-            return ' ' . trim($lock) . ' ';
+            return ' '.trim($lock).' ';
         }
     }
 
@@ -1064,7 +1064,7 @@ 
         foreach ($dataSet as $data) {
             $data = $this->parseData($query, $data, $allowFields, $bind);
 
-            $values[] = 'SELECT ' . implode(',', array_values($data));
+            $values[] = 'SELECT '.implode(',', array_values($data));
 
             if (!isset($insertFields)) {
                 $insertFields = array_keys($data);
@@ -1107,7 +1107,7 @@ 
             $field = $this->parseKey($query, $field, true);
         }
 
-        return 'INSERT INTO ' . $this->parseTable($query, $table) . ' (' . implode(',', $fields) . ') ' . $this->select($query);
+        return 'INSERT INTO '.$this->parseTable($query, $table).' ('.implode(',', $fields).') '.$this->select($query);
     }
 
     /**
@@ -1127,7 +1127,7 @@ 
         }
 
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -1159,7 +1159,7 @@ 
             ['%TABLE%', '%USING%', '%JOIN%', '%WHERE%', '%ORDER%', '%LIMIT%', '%LOCK%', '%COMMENT%'],
             [
                 $this->parseTable($query, $options['table']),
-                !empty($options['using']) ? ' USING ' . $this->parseTable($query, $options['using']) . ' ' : '',
+                !empty($options['using']) ? ' USING '.$this->parseTable($query, $options['using']).' ' : '',
                 $this->parseJoin($query, $options['join']),
                 $this->parseWhere($query, $options['where']),
                 $this->parseOrder($query, $options['order']),