From d89fb4bd0a97bf778884cc02d71c36584572aca0 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 27 Dec 2016 13:43:31 +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=20=E5=A2=9E=E5=8A=A0=E5=AF=B9null?=
 =?UTF-8?q?=E5=92=8C=E5=AF=B9=E8=B1=A1=E6=95=B0=E6=8D=AE=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php
index fb315057..24ff06ff 100644
--- a/library/think/db/Builder.php
+++ b/library/think/db/Builder.php
@@ -702,8 +702,13 @@ abstract class Builder
                         throw new Exception('fields not exists:[' . $key . ']');
                     }
                     unset($data[$key]);
+                } elseif (is_null($val)) {
+                    $data[$key] = 'NULL';
                 } elseif (is_scalar($val)) {
                     $data[$key] = $this->parseValue($val, $key);
+                } elseif (is_object($val) && method_exists($val, '__toString')) {
+                    // 对象数据写入
+                    $data[$key] = $val->__toString();
                 } else {
                     // 过滤掉非标量数据
                     unset($data[$key]);