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

改进

Browse Source
This commit is contained in:
thinkphp
2018-04-25 15:41:12 +08:00
parent 80488e79cb
commit 1cfef7aadc
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -451,7 +451,7 @@ abstract class Connection
$this->debug(false, '', true);
if ($query && !empty($this->config['deploy']) && !empty($this->config['read_master'])) {
$query->readMaster(true);
$query->readMaster();
}
$this->numRows = $this->PDOStatement->rowCount();

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

@@ -145,17 +145,19 @@ class Query
/**
* 设置后续从主库读取数据
* @access public
* @param bool $master
* @param bool $allTable
* @return void
*/
public function readMaster($master = true)
public function readMaster($allTable = false)
{
if ($master) {
if ($allTable) {
$table = '*';
} else {
$table = isset($this->options['table']) ? $this->options['table'] : $this->getTable();
static::$readMaster[$table] = true;
}
static::$readMaster[$table] = true;
return $this;
}
@@ -2942,7 +2944,7 @@ class Query
}
}
if (isset(static::$readMaster[$options['table']])) {
if (isset(static::$readMaster['*']) || isset(static::$readMaster[$options['table']])) {
$options['master'] = true;
}