top-think / framework

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) {
@@ -317,7 +317,7 @@ 
 
                     if (!empty($whereClause)) {
                         $query->bind($newQuery->getBind(false));
-                        $str[] = ' ' . $logic . ' ( ' . $whereClause . ' )';
+                        $str[] = ' '.$logic.' ( '.$whereClause.' )';
                     }
                 } elseif (is_array($field)) {
                     array_unshift($value, $field);
@@ -326,7 +326,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);
@@ -336,7 +336,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);
@@ -346,11 +346,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);
                 }
             }
 
@@ -388,7 +388,7 @@ 
                 $str[] = $this->parseWhereItem($query, $field, $item, $rule, $binds);
             }
 
-            return '( ' . implode(' ' . $rule . ' ', $str) . ' )';
+            return '( '.implode(' '.$rule.' ', $str).' )';
         }
 
         // 检测操作符
@@ -415,7 +415,7 @@ 
             if (0 === strpos($value, ':') && $query->isBind(substr($value, 1))) {
             } else {
                 $name  = $query->bind($value, $bindType);
-                $value = ':' . $name;
+                $value = ':'.$name;
             }
         }
 
@@ -428,7 +428,7 @@ 
         }
 
         if (!isset($whereStr)) {
-            throw new Exception('where express error:' . $exp);
+            throw new Exception('where express error:'.$exp);
         }
 
         return $whereStr;
@@ -452,12 +452,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;
@@ -480,10 +480,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).' )';
     }
 
     /**
@@ -500,7 +500,7 @@ 
     protected function parseExp(Query $query, $key, $exp, Expression $value, $field, $bindType)
     {
         // 表达式查询
-        return '( ' . $key . ' ' . $value->getValue() . ' )';
+        return '( '.$key.' '.$value->getValue().' )';
     }
 
     /**
@@ -517,7 +517,7 @@ 
     protected function parseNull(Query $query, $key, $exp, $value, $field, $bindType)
     {
         // NULL 查询
-        return $key . ' IS ' . $exp;
+        return $key.' IS '.$exp;
     }
 
     /**
@@ -539,7 +539,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.' ';
     }
 
     /**
@@ -561,10 +561,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.')';
     }
 
     /**
@@ -580,7 +580,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);
     }
 
     /**
@@ -597,7 +597,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));
         }
 
         // 比较运算
@@ -606,10 +606,10 @@ 
         }
 
         if ('=' == $exp && is_null($value)) {
-            return $key . ' IS NULL';
+            return $key.' IS NULL';
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -629,7 +629,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);
@@ -660,18 +660,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.')';
     }
 
     /**
@@ -736,7 +736,7 @@ 
 
         $name = $query->bind($value, $bindType);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -748,7 +748,7 @@ 
      */
     protected function parseLimit(Query $query, $limit)
     {
-        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT ' . $limit . ' ' : '';
+        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT '.$limit.' ' : '';
     }
 
     /**
@@ -774,7 +774,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;
                     }
@@ -782,7 +782,7 @@ 
 
                 $table = $this->parseTable($query, $table);
 
-                $joinStr .= ' ' . $type . ' JOIN ' . $table . ' ON ' . implode(' AND ', $condition);
+                $joinStr .= ' '.$type.' JOIN '.$table.' ON '.implode(' AND ', $condition);
             }
         }
 
@@ -807,22 +807,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);
     }
 
     /**
@@ -843,7 +843,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']);
@@ -852,7 +852,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;
     }
 
     /**
@@ -876,7 +876,7 @@ 
             $val[] = $this->parseKey($query, $key);
         }
 
-        return ' GROUP BY ' . implode(',', $val);
+        return ' GROUP BY '.implode(',', $val);
     }
 
     /**
@@ -888,7 +888,7 @@ 
      */
     protected function parseHaving(Query $query, $having)
     {
-        return !empty($having) ? ' HAVING ' . $having : '';
+        return !empty($having) ? ' HAVING '.$having : '';
     }
 
     /**
@@ -904,7 +904,7 @@ 
             $comment = strstr($comment, '*/', true);
         }
 
-        return !empty($comment) ? ' /* ' . $comment . ' */' : '';
+        return !empty($comment) ? ' /* '.$comment.' */' : '';
     }
 
     /**
@@ -937,13 +937,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);
     }
 
     /**
@@ -974,7 +974,7 @@ 
         if (is_bool($lock)) {
             return $lock ? ' FOR UPDATE ' : '';
         } elseif (is_string($lock) && !empty($lock)) {
-            return ' ' . trim($lock) . ' ';
+            return ' '.trim($lock).' ';
         }
     }
 
@@ -1065,7 +1065,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);
@@ -1108,7 +1108,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);
     }
 
     /**
@@ -1128,7 +1128,7 @@ 
         }
 
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -1160,7 +1160,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']),