top-think / framework

src/think/db/Builder.php

Spacing +66 added lines, -66 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db;
 
@@ -158,20 +158,20 @@ 
             if (false !== strpos($key, '->')) {
                 list($key, $name) = explode('->', $key, 2);
                 $item             = $this->parseKey($query, $key);
-                $result[$item]    = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key . '->' . $name, $val, $bind) . ')';
+                $result[$item]    = 'json_set('.$item.', \'$.'.$name.'\', '.$this->parseDataBind($query, $key.'->'.$name, $val, $bind).')';
             } elseif (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;
                 }
             } elseif (is_scalar($val)) {
@@ -200,7 +200,7 @@ 
 
         $name = $query->bindValue($data, $bind[$key] ?? PDO::PARAM_STR);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -225,7 +225,7 @@ 
      */
     protected function parseExtra(Query $query, string $extra): string
     {
-        return preg_match('/^[\w]+$/i', $extra) ? ' ' . strtoupper($extra) : '';
+        return preg_match('/^[\w]+$/i', $extra) ? ' '.strtoupper($extra) : '';
     }
 
     /**
@@ -245,7 +245,7 @@ 
                 if ($field instanceof Raw) {
                     $array[] = $field->getValue();
                 } elseif (!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);
                 }
@@ -275,9 +275,9 @@ 
             if ($table instanceof Raw) {
                 $item[] = $table->getValue();
             } elseif (!is_numeric($key)) {
-                $item[] = $this->parseKey($query, $key) . ' ' . $this->parseKey($query, $table);
+                $item[] = $this->parseKey($query, $key).' '.$this->parseKey($query, $table);
             } elseif (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);
             }
@@ -303,11 +303,11 @@ 
             list($field, $condition) = $options['soft_delete'];
 
             $binds    = $query->getFieldsBindType();
-            $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;
     }
 
     /**
@@ -350,20 +350,20 @@ 
         $where = [];
         foreach ($val as $value) {
             if ($value instanceof Raw) {
-                $where[] = ' ' . $logic . ' ( ' . $value->getValue() . ' )';
+                $where[] = ' '.$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 (true === $value) {
-                $where[] = ' ' . $logic . ' 1 ';
+                $where[] = ' '.$logic.' 1 ';
                 continue;
             } 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) {
@@ -372,7 +372,7 @@ 
             } elseif (is_array($field)) {
                 $where[] = $this->parseMultiWhereField($query, $value, $field, $logic, $binds);
             } elseif ($field instanceof Raw) {
-                $where[] = ' ' . $logic . ' ' . $this->parseWhereItem($query, $field, $value, $binds);
+                $where[] = ' '.$logic.' '.$this->parseWhereItem($query, $field, $value, $binds);
             } elseif (strpos($field, '|')) {
                 $where[] = $this->parseFieldsOr($query, $value, $field, $logic, $binds);
             } elseif (strpos($field, '&')) {
@@ -380,7 +380,7 @@ 
             } else {
                 // 对字段使用表达式查询
                 $field   = is_string($field) ? $field : '';
-                $where[] = ' ' . $logic . ' ' . $this->parseWhereItem($query, $field, $value, $binds);
+                $where[] = ' '.$logic.' '.$this->parseWhereItem($query, $field, $value, $binds);
             }
         }
 
@@ -405,7 +405,7 @@ 
             $item[] = $this->parseWhereItem($query, $k, $value, $binds);
         }
 
-        return ' ' . $logic . ' ( ' . implode(' AND ', $item) . ' )';
+        return ' '.$logic.' ( '.implode(' AND ', $item).' )';
     }
 
     /**
@@ -426,7 +426,7 @@ 
             $item[] = $this->parseWhereItem($query, $k, $value, $binds);
         }
 
-        return ' ' . $logic . ' ( ' . implode(' OR ', $item) . ' )';
+        return ' '.$logic.' ( '.implode(' OR ', $item).' )';
     }
 
     /**
@@ -444,7 +444,7 @@ 
         $whereClause = $this->buildWhere($query, $newQuery->getOptions('where') ?: []);
 
         if (!empty($whereClause)) {
-            $where = ' ' . $logic . ' ( ' . $whereClause . ' )';
+            $where = ' '.$logic.' ( '.$whereClause.' )';
         }
 
         return $where ?? '';
@@ -469,7 +469,7 @@ 
             $where[] = $this->parseWhereItem($query, array_shift($item), $item, $binds);
         }
 
-        return ' ' . $logic . ' ( ' . implode(' AND ', $where) . ' )';
+        return ' '.$logic.' ( '.implode(' AND ', $where).' )';
     }
 
     /**
@@ -490,7 +490,7 @@ 
 
         // 检测操作符
         if (!is_string($exp)) {
-            throw new Exception('where express error:' . var_export($exp, true));
+            throw new Exception('where express error:'.var_export($exp, true));
         }
 
         $exp = strtoupper($exp);
@@ -515,7 +515,7 @@ 
             if (is_string($value) && 0 === strpos($value, ':') && $query->isBind(substr($value, 1))) {
             } else {
                 $name  = $query->bindValue($value, $bindType);
-                $value = ':' . $name;
+                $value = ':'.$name;
             }
         }
 
@@ -526,7 +526,7 @@ 
             }
         }
 
-        throw new Exception('where express error:' . $exp);
+        throw new Exception('where express error:'.$exp);
     }
 
     /**
@@ -548,12 +548,12 @@ 
             $array = [];
             foreach ($value as $item) {
                 $name    = $query->bindValue($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;
@@ -573,7 +573,7 @@ 
     protected function parseExp(Query $query, string $key, string $exp, Raw $value, string $field, int $bindType): string
     {
         // 表达式查询
-        return '( ' . $key . ' ' . $value->getValue() . ' )';
+        return '( '.$key.' '.$value->getValue().' )';
     }
 
     /**
@@ -593,10 +593,10 @@ 
         list($op, $field) = $value;
 
         if (!in_array(trim($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, $field, true) . ' )';
+        return '( '.$key.' '.$op.' '.$this->parseKey($query, $field, true).' )';
     }
 
     /**
@@ -613,7 +613,7 @@ 
     protected function parseNull(Query $query, string $key, string $exp, $value, $field, int $bindType): string
     {
         // NULL 查询
-        return $key . ' IS ' . $exp;
+        return $key.' IS '.$exp;
     }
 
     /**
@@ -635,7 +635,7 @@ 
         $min = $query->bindValue($data[0], $bindType);
         $max = $query->bindValue($data[1], $bindType);
 
-        return $key . ' ' . $exp . ' :' . $min . ' AND :' . $max . ' ';
+        return $key.' '.$exp.' :'.$min.' AND :'.$max.' ';
     }
 
     /**
@@ -657,10 +657,10 @@ 
         } elseif ($value instanceof Raw) {
             $value = $value->getValue();
         } else {
-            throw new Exception('where express error:' . $value);
+            throw new Exception('where express error:'.$value);
         }
 
-        return $exp . ' ( ' . $value . ' )';
+        return $exp.' ( '.$value.' )';
     }
 
     /**
@@ -676,7 +676,7 @@ 
      */
     protected function parseTime(Query $query, string $key, string $exp, $value, $field, int $bindType): string
     {
-        return $key . ' ' . substr($exp, 0, 2) . ' ' . $this->parseDateTime($query, $value, $field, $bindType);
+        return $key.' '.substr($exp, 0, 2).' '.$this->parseDateTime($query, $value, $field, $bindType);
     }
 
     /**
@@ -693,7 +693,7 @@ 
     protected function parseCompare(Query $query, string $key, string $exp, $value, $field, int $bindType): string
     {
         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));
         }
 
         // 比较运算
@@ -702,10 +702,10 @@ 
         }
 
         if ('=' == $exp && is_null($value)) {
-            return $key . ' IS NULL';
+            return $key.' IS NULL';
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -725,7 +725,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);
@@ -756,18 +756,18 @@ 
 
             foreach ($value as $v) {
                 $name    = $query->bindValue($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.')';
     }
 
     /**
@@ -830,7 +830,7 @@ 
 
         $name = $query->bindValue($value, $bindType);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -842,7 +842,7 @@ 
      */
     protected function parseLimit(Query $query, string $limit): string
     {
-        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT ' . $limit . ' ' : '';
+        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT '.$limit.' ' : '';
     }
 
     /**
@@ -862,14 +862,14 @@ 
             if (strpos($on, '=')) {
                 list($val1, $val2) = explode('=', $on, 2);
 
-                $condition = $this->parseKey($query, $val1) . '=' . $this->parseKey($query, $val2);
+                $condition = $this->parseKey($query, $val1).'='.$this->parseKey($query, $val2);
             } else {
                 $condition = $on;
             }
 
             $table = $this->parseTable($query, $table);
 
-            $joinStr .= ' ' . $type . ' JOIN ' . $table . ' ON ' . $condition;
+            $joinStr .= ' '.$type.' JOIN '.$table.' ON '.$condition;
         }
 
         return $joinStr;
@@ -894,22 +894,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);
     }
 
     /**
@@ -941,14 +941,14 @@ 
         }
 
         $sort = strtoupper($sort);
-        $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
+        $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' '.$sort : '';
         $bind = $query->getFieldsBindType();
 
         foreach ($val as $item) {
             $val[] = $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;
     }
 
     /**
@@ -973,7 +973,7 @@ 
             $val[] = $this->parseKey($query, $key);
         }
 
-        return ' GROUP BY ' . implode(',', $val);
+        return ' GROUP BY '.implode(',', $val);
     }
 
     /**
@@ -985,7 +985,7 @@ 
      */
     protected function parseHaving(Query $query, string $having): string
     {
-        return !empty($having) ? ' HAVING ' . $having : '';
+        return !empty($having) ? ' HAVING '.$having : '';
     }
 
     /**
@@ -1001,7 +1001,7 @@ 
             $comment = strstr($comment, '*/', true);
         }
 
-        return !empty($comment) ? ' /* ' . $comment . ' */' : '';
+        return !empty($comment) ? ' /* '.$comment.' */' : '';
     }
 
     /**
@@ -1034,13 +1034,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 . ' ( ' . $u . ' )';
+                $sql[] = $type.' ( '.$u.' )';
             }
         }
 
-        return ' ' . implode(' ', $sql);
+        return ' '.implode(' ', $sql);
     }
 
     /**
@@ -1077,7 +1077,7 @@ 
         }
 
         if (is_string($lock) && !empty($lock)) {
-            return ' ' . trim($lock) . ' ';
+            return ' '.trim($lock).' ';
         } else {
             return '';
         }
@@ -1174,7 +1174,7 @@ 
         foreach ($dataSet as $k => $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);
@@ -1212,7 +1212,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);
     }
 
     /**
@@ -1233,7 +1233,7 @@ 
 
         $set = [];
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -1267,7 +1267,7 @@ 
             [
                 $this->parseTable($query, $options['table']),
                 $this->parseExtra($query, $options['extra']),
-                !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']),