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

query类增加fetchClass方法用于指定返回数据集类型

Browse Source
This commit is contained in:
thinkphp
2016-05-09 12:22:34 +08:00
parent e7839557c6
commit 4633f240d0
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/think/db/Connection.php
View File

@@ -302,12 +302,12 @@ abstract class Connection
* @param array $bind 参数绑定
* @param boolean $fetch 不执行只是获取SQL
* @param boolean $master 是否在主服务器读操作
* @param bool|string $returnPdo 是否返回 PDOStatement 对象 如果为字符串则指定类
* @param bool|string $class 指定返回的数据集对象
* @return mixed
* @throws DbBindParamException
* @throws PDOException
*/
public function query($sql, $bind = [], $fetch = false, $master = false, $returnPdo = false)
public function query($sql, $bind = [], $fetch = false, $master = false, $class = false)
{
$this->initConnect($master);
if (!$this->linkID) {
@@ -337,7 +337,7 @@ abstract class Connection
$result = $this->PDOStatement->execute();
// 调试结束
$this->debug(false);
return true === $returnPdo ? $this->PDOStatement : $this->getResult($returnPdo);
return $this->getResult($class);
} catch (\PDOException $e) {
throw new PDOException($e, $this->config, $this->queryStr);
}
@@ -451,15 +451,20 @@ abstract class Connection
/**
* 获得数据集
* @access protected
* @param string $class 针对RESULTSET_CLASS 用于指定的类名
* @param bool|string $class true 返回PDOStatement 字符串用于指定返回的类名
* @return mixed
*/
protected function getResult($class = '')
{
if (true === $class) {
// 返回PDOStatement对象处理
return $this->PDOStatement;
}
$result = $this->PDOStatement->fetchAll($this->fetchType);
$this->numRows = count($result);
// 返回指定对象类
if (!empty($class)) {
// 返回指定数据集对象类
return new $class($result);
}
switch ($this->resultSetType) {

20
library/think/db/Query.php
View File

@@ -847,7 +847,19 @@ class Query
*/
public function fetchPdo($pdo = true)
{
$this->options['fetch_pdo'] = $pdo;
$this->options['fetch_class'] = $pdo;
return $this;
}
/**
* 指定数据集返回对象
* @access public
* @param string $class 指定返回的数据集对象类名
* @return $this
*/
public function fetchClass($class)
{
$this->options['fetch_class'] = $class;
return $this;
}
@@ -1304,7 +1316,7 @@ class Query
// 生成查询SQL
$sql = $this->builder()->select($options);
// 执行查询操作
$resultSet = $this->connection->query($sql, $this->getBind(), $options['fetch_sql'], $options['master'], $options['fetch_pdo']);
$resultSet = $this->connection->query($sql, $this->getBind(), $options['fetch_sql'], $options['master'], $options['fetch_class']);
if (is_string($resultSet)) {
// 返回SQL
@@ -1385,7 +1397,7 @@ class Query
// 生成查询SQL
$sql = $this->builder()->select($options);
// 执行查询
$result = $this->connection->query($sql, $this->getBind(), $options['fetch_sql'], $options['master'], $options['fetch_pdo']);
$result = $this->connection->query($sql, $this->getBind(), $options['fetch_sql'], $options['master'], $options['fetch_class']);
if (is_string($result)) {
// 返回SQL
@@ -1539,7 +1551,7 @@ class Query
$options['strict'] = $this->connection->getConfig('fields_strict');
}
foreach (['master', 'lock', 'fetch_pdo', 'fetch_sql', 'distinct'] as $name) {
foreach (['master', 'lock', 'fetch_class', 'fetch_sql', 'distinct'] as $name) {
if (!isset($options[$name])) {
$options[$name] = false;
}