From b4a19052007d0c9e51eecb46d93b38eb4fa9666b Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 21 Jun 2016 13:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BBuilder=E7=B1=BB=E7=9A=84inse?=
 =?UTF-8?q?rtall=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Builder.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php
index d4b6a054..f07eca0c 100644
--- a/library/think/db/Builder.php
+++ b/library/think/db/Builder.php
@@ -340,13 +340,13 @@ abstract class Builder
             } else {
                 $whereStr .= $exp . ' (' . $value . ')';
             }
-        } elseif (in_array($exp, ['< TIME', '> TIME'])){
-            $whereStr .= $key . ' ' . substr($exp,0,1) . ' ' . $this->parseDateTime($value, $field);
-        } elseif (in_array($exp, ['BETWEEN TIME', 'NOT BETWEEN TIME'])){
-            if(is_string($value)){
-                $value = explode(',',$value);
+        } elseif (in_array($exp, ['< TIME', '> TIME'])) {
+            $whereStr .= $key . ' ' . substr($exp, 0, 1) . ' ' . $this->parseDateTime($value, $field);
+        } elseif (in_array($exp, ['BETWEEN TIME', 'NOT BETWEEN TIME'])) {
+            if (is_string($value)) {
+                $value = explode(',', $value);
             }
-            $whereStr .= $key . ' ' . substr($exp,0,-4) . $this->parseDateTime($value[0], $field) . ' AND ' . $this->parseDateTime($value[1], $field);
+            $whereStr .= $key . ' ' . substr($exp, 0, -4) . $this->parseDateTime($value[0], $field) . ' AND ' . $this->parseDateTime($value[1], $field);
         }
         return $whereStr;
     }
@@ -370,17 +370,17 @@ abstract class Builder
     {
         // 获取时间字段类型
         $type = $this->query->getTableInfo('', 'type');
-        if(isset($type[$key])){
+        if (isset($type[$key])) {
             $value = strtotime($value) ?: $value;
-            if(preg_match('/(datetime|timestamp)/is', $type[$key])){
+            if (preg_match('/(datetime|timestamp)/is', $type[$key])) {
                 // 日期及时间戳类型
                 $value = date('Y-m-d H:i:s', $value);
-            }elseif(preg_match('/(date)/is', $type[$key])){
+            } elseif (preg_match('/(date)/is', $type[$key])) {
                 // 日期及时间戳类型
                 $value = date('Y-m-d', $value);
             }
         }
-        return is_int($value)? $value : $this->connection->quote($value);
+        return is_int($value) ? $value : $this->connection->quote($value);
     }
 
     /**
@@ -625,7 +625,7 @@ abstract class Builder
             $value    = array_values($data);
             $values[] = 'SELECT ' . implode(',', $value);
         }
-        $fields = array_map([$this, 'parseKey'], array_keys($dataSet[0]));
+        $fields = array_map([$this, 'parseKey'], array_keys(reset($dataSet)));
         $sql    = str_replace(
             ['%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'],
             [