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

fetchPdo方法调整

Browse Source
This commit is contained in:
thinkphp
2017-01-11 16:01:48 +08:00
parent 214ed4976c
commit 4cb2428df4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1400,7 +1400,7 @@ class Query
*/ */
public function fetchPdo($pdo = true) public function fetchPdo($pdo = true)
{ {
$this->options['fetch_class'] = $pdo; $this->options['fetch_pdo'] = $pdo;
return $this; return $this;
} }
@@ -2071,7 +2071,7 @@ class Query
if ($resultSet = $this->trigger('before_select', $options)) { if ($resultSet = $this->trigger('before_select', $options)) {
} else { } else {
// 执行查询操作 // 执行查询操作
$resultSet = $this->query($sql, $bind, $options['master'], $options['fetch_class']); $resultSet = $this->query($sql, $bind, $options['master'], $options['fetch_pdo']);
if ($resultSet instanceof \PDOStatement) { if ($resultSet instanceof \PDOStatement) {
// 返回PDOStatement对象 // 返回PDOStatement对象
@@ -2174,7 +2174,7 @@ class Query
if ($result = $this->trigger('before_find', $options)) { if ($result = $this->trigger('before_find', $options)) {
} else { } else {
// 执行查询 // 执行查询
$result = $this->query($sql, $bind, $options['master'], $options['fetch_class']); $result = $this->query($sql, $bind, $options['master'], $options['fetch_pdo']);
if ($result instanceof \PDOStatement) { if ($result instanceof \PDOStatement) {
// 返回PDOStatement对象 // 返回PDOStatement对象
@@ -2454,7 +2454,7 @@ class Query
$options['strict'] = $this->getConfig('fields_strict'); $options['strict'] = $this->getConfig('fields_strict');
} }
foreach (['master', 'lock', 'fetch_class', 'fetch_sql', 'distinct'] as $name) { foreach (['master', 'lock', 'fetch_pdo', 'fetch_sql', 'distinct'] as $name) {
if (!isset($options[$name])) { if (!isset($options[$name])) {
$options[$name] = false; $options[$name] = false;
} }