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

修正Model类一处BUG

Browse Source
This commit is contained in:
thinkphp
2016-02-02 10:07:14 +08:00
parent 97166efd34
commit 6e7151145b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Model.php
View File

@@ -234,7 +234,7 @@ class Model
unset($data[$key]); unset($data[$key]);
} elseif (is_scalar($val) && !isset($this->options['bind'][$key])) { } elseif (is_scalar($val) && !isset($this->options['bind'][$key])) {
// 字段类型检查 // 字段类型检查
$this->_parseType($data, $key, $this->options['bind']); $this->_parseType($this->getTableName(), $data, $key, $this->options['bind']);
} }
} }
} }
@@ -808,7 +808,7 @@ class Model
$key = trim($key); $key = trim($key);
if (in_array($key, $fields, true)) { if (in_array($key, $fields, true)) {
if (is_scalar($val) && empty($options['bind'][$key])) { if (is_scalar($val) && empty($options['bind'][$key])) {
$this->_parseType($options['where'], $key, $options['bind']); $this->_parseType($options['table'], $options['where'], $key, $options['bind']);
} }
} }
} }
@@ -826,14 +826,15 @@ class Model
/** /**
* 数据类型检测 * 数据类型检测
* @access protected * @access protected
* @param string $table 表名
* @param array $data 数据 * @param array $data 数据
* @param string $key 字段名 * @param string $key 字段名
* @param array $bind 参数绑定列表 * @param array $bind 参数绑定列表
* @return void * @return void
*/ */
protected function _parseType(&$data, $key, &$bind) protected function _parseType($table, &$data, $key, &$bind)
{ {
$binds = $this->getTableInfo('', 'bind'); $binds = $this->getTableInfo($table, 'bind');
$bind[$key] = [$data[$key], isset($binds[$key]) ? $binds[$key] : \PDO::PARAM_STR]; $bind[$key] = [$data[$key], isset($binds[$key]) ? $binds[$key] : \PDO::PARAM_STR];
$data[$key] = ':' . $key; $data[$key] = ':' . $key;
} }

2
library/think/db/Driver.php
View File

@@ -1114,7 +1114,7 @@ abstract class Driver
*/ */
public function getLastSql($model = '') public function getLastSql($model = '')
{ {
return $model ? $this->modelSql[$model] : $this->queryStr; return ($model && isset($this->modelSql[$model])) ? $this->modelSql[$model] : $this->queryStr;
} }
/** /**