mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 15:12:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

模型类修正对字段类型检测的处理

Browse Source
This commit is contained in:
ThinkPHP
2013-04-27 17:54:20 +08:00
parent 81c802ca8a
commit f3e00893af
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Think/Model.php
View File

@@ -160,7 +160,7 @@ class Model {
foreach ($data as $key=>$val){ foreach ($data as $key=>$val){
if(!in_array($key,$this->fields,true)){ if(!in_array($key,$this->fields,true)){
unset($data[$key]); unset($data[$key]);
}elseif(is_scalar($val)) { }elseif(is_scalar($val) && empty($this->options['bind'][':'.$key])) {
// 字段类型检查 // 字段类型检查
$this->_parseType($data,$key); $this->_parseType($data,$key);
} }
@@ -197,10 +197,10 @@ class Model {
return false; return false;
} }
} }
// 分析表达式
$options = $this->_parseOptions();
// 数据处理 // 数据处理
$data = $this->_write_data($data); $data = $this->_write_data($data);
// 分析表达式
$options = $this->_parseOptions();
if(false === $this->_before_insert($data,$options)) { if(false === $this->_before_insert($data,$options)) {
return false; return false;
} }
@@ -408,7 +408,7 @@ class Model {
foreach ($options['where'] as $key=>$val){ foreach ($options['where'] as $key=>$val){
$key = trim($key); $key = trim($key);
if(in_array($key,$fields,true)){ if(in_array($key,$fields,true)){
if(is_scalar($val)) { if(is_scalar($val) && empty($options['bind'][':'.$key])) {
$this->_parseType($options['where'],$key); $this->_parseType($options['where'],$key);
} }
}elseif('_' != substr($key,0,1) && false === strpos($key,'.') && false === strpos($key,'(') && false === strpos($key,'|') && false === strpos($key,'&')){ }elseif('_' != substr($key,0,1) && false === strpos($key,'.') && false === strpos($key,'(') && false === strpos($key,'|') && false === strpos($key,'&')){
@@ -431,7 +431,7 @@ class Model {
* @return void * @return void
*/ */
protected function _parseType(&$data,$key) { protected function _parseType(&$data,$key) {
if(empty($this->options['bind'][':'.$key]) && isset($this->fields['_type'][$key])) { if(isset($this->fields['_type'][$key])) {
$fieldType = strtolower($this->fields['_type'][$key]); $fieldType = strtolower($this->fields['_type'][$key]);
if(false === strpos($fieldType,'bigint') && false !== strpos($fieldType,'int')) { if(false === strpos($fieldType,'bigint') && false !== strpos($fieldType,'int')) {
$data[$key] = intval($data[$key]); $data[$key] = intval($data[$key]);