Merge pull request top-think#398 from terranc/patch-1

liu21st · liu21st · commit f44bd2a5175a · 2016-03-24T13:32:44.000+08:00
解决ON DUPLICATE KEY时值不能为NULL的问题
diff --git a/ThinkPHP/Library/Think/Db/Driver/Mysql.class.php b/ThinkPHP/Library/Think/Db/Driver/Mysql.class.php
@@ -192,7 +192,7 @@ protected function parseDuplicate($duplicate)
                     $val = array('value', $val);
                 }
 
-                if (!isset($val[1])) {
+                if (!isset($val[1]) && !is_null($val[1])) {
                     continue;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ protected function parseDuplicate($duplicate)`
`192`	`192`	`$val = array('value', $val);`
`193`	`193`	`}`
`194`	`194`
`195`		`- if (!isset($val[1])) {`
	`195`	`+ if (!isset($val[1]) && !is_null($val[1])) {`
`196`	`196`	`continue;`
`197`	`197`	`}`
`198`	`198`