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

改进Db/Driver类 对闭包查询条件的支持 fetchMode方法更改为fetchPdo方法 如果传入true 则表示查询结果返回PDOStatment对象

Browse Source
This commit is contained in:
thinkphp
2016-04-07 14:13:40 +08:00
parent f162cbc44f
commit a9980abba8
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Model.php
View File

@@ -71,6 +71,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{ {
if (empty($data)) { if (empty($data)) {
$this->isUpdate = false; $this->isUpdate = false;
} elseif (is_object($data)) {
$this->data = get_object_vars($data);
} else { } else {
$this->data = $data; $this->data = $data;
} }

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

@@ -217,10 +217,10 @@ abstract class Driver
* @param array $bind 参数绑定 * @param array $bind 参数绑定
* @param boolean $fetch 不执行只是获取SQL * @param boolean $fetch 不执行只是获取SQL
* @param boolean $master 是否在主服务器读操作 * @param boolean $master 是否在主服务器读操作
* @param boolean $mode fetch Mode false表示不返回数据只返回 PDOStatement 对象 * @param bool $returnPdo 是否返回 PDOStatement 对象
* @return mixed * @return mixed
*/ */
public function query($sql, $bind = [], $fetch = false, $master = false, $mode = true) public function query($sql, $bind = [], $fetch = false, $master = false, $returnPdo = false)
{ {
$this->initConnect($master); $this->initConnect($master);
if (!$this->linkID) { if (!$this->linkID) {
@@ -250,7 +250,7 @@ abstract class Driver
$result = $this->PDOStatement->execute(); $result = $this->PDOStatement->execute();
// 调试结束 // 调试结束
$this->debug(false); $this->debug(false);
return $mode ? $this->getResult($mode) : $this->PDOStatement; return $returnPdo ? $this->PDOStatement : $this->getResult();
} catch (\PDOException $e) { } catch (\PDOException $e) {
throw new PDOException($e, $this->config, $this->queryStr); throw new PDOException($e, $this->config, $this->queryStr);
} }
@@ -360,17 +360,9 @@ abstract class Driver
* @access private * @access private
* @return array * @return array
*/ */
private function getResult($mode) private function getResult()
{ {
if (true === $mode) { $result = $this->PDOStatement->fetchAll(PDO::FETCH_ASSOC);
$mode = PDO::FETCH_ASSOC;
}
// 根据fetchMode返回数据集
if (is_array($mode)) {
$result = $this->PDOStatement->fetchAll($mode[0], $mode[1]);
} else {
$result = $this->PDOStatement->fetchAll($mode);
}
$this->numRows = count($result); $this->numRows = count($result);
return $result; return $result;
} }
@@ -919,12 +911,12 @@ abstract class Driver
/** /**
* 不主动获取数据集 * 不主动获取数据集
* @access public * @access public
* @param mixed $fetch fetch mode * @param bool $pdo 是否返回 PDOStatement 对象
* @return Model * @return Model
*/ */
public function fetchMode($fetch = true) public function fetchPdo($pdo = true)
{ {
$this->options['fetch_mode'] = $fetch; $this->options['fetch_pdo'] = $pdo;
return $this; return $this;
} }
@@ -1195,7 +1187,7 @@ abstract class Driver
public function options(array $options) public function options(array $options)
{ {
$this->options = array_merge($this->options, $options); $this->options = $options;
return $this; return $this;
} }
@@ -1470,6 +1462,7 @@ abstract class Driver
if ($value instanceof \Closure) { if ($value instanceof \Closure) {
// 使用闭包查询 // 使用闭包查询
$class = clone $this; $class = clone $this;
$class->options([]);
call_user_func_array($value, [ & $class]); call_user_func_array($value, [ & $class]);
$str[] = ' ' . $key . ' ( ' . $class->buildWhere() . ' )'; $str[] = ' ' . $key . ' ( ' . $class->buildWhere() . ' )';
} else { } else {
@@ -1567,6 +1560,7 @@ abstract class Driver
protected function parseClosure($call, $show = true) protected function parseClosure($call, $show = true)
{ {
$class = clone $this; $class = clone $this;
$class->options([]);
call_user_func_array($call, [ & $class]); call_user_func_array($call, [ & $class]);
return $class->buildSql($show); return $class->buildSql($show);
} }
@@ -1908,7 +1902,7 @@ abstract class Driver
$options = $this->_parseOptions(); $options = $this->_parseOptions();
$sql = $this->buildSelectSql($options); $sql = $this->buildSelectSql($options);
$resultSet = $this->query($sql, $this->getBindParams(), !empty($options['fetch_sql']) ? true : false, !empty($options['master']) ? true : false, isset($options['fetch_mode']) ? $options['fetch_mode'] : true); $resultSet = $this->query($sql, $this->getBindParams(), !empty($options['fetch_sql']) ? true : false, !empty($options['master']) ? true : false, isset($options['fetch_pdo']) ? $options['fetch_pdo'] : true);
if (!empty($resultSet)) { if (!empty($resultSet)) {
if (is_string($resultSet)) { if (is_string($resultSet)) {
@@ -1981,7 +1975,7 @@ abstract class Driver
$options = $this->_parseOptions(); $options = $this->_parseOptions();
$options['limit'] = 1; $options['limit'] = 1;
$sql = $this->buildSelectSql($options); $sql = $this->buildSelectSql($options);
$result = $this->query($sql, $this->getBindParams(), !empty($options['fetch_sql']) ? true : false, !empty($options['master']) ? true : false, isset($options['fetch_mode']) ? $options['fetch_mode'] : true); $result = $this->query($sql, $this->getBindParams(), !empty($options['fetch_sql']) ? true : false, !empty($options['master']) ? true : false, isset($options['fetch_pdo']) ? $options['fetch_pdo'] : false);
// 数据处理 // 数据处理
if (!empty($result)) { if (!empty($result)) {