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:01:48 +08:00
parent 0ad7586556
commit 4003537d84
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Model.php
View File

@@ -183,7 +183,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @param bool $master 是否从主库读取
* @return void
*/
public function readMaster($master)
public function readMaster($master = true)
{
if ($master) {
static::$readMaster[$this->class] = true;

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

@@ -451,24 +451,24 @@ abstract class Connection
$this->debug(false);
if ($query && !empty($this->config['deploy']) && !empty($this->config['read_master'])) {
$query->setModelReadMaster(true);
$query->readMaster(true);
}
$this->numRows = $this->PDOStatement->rowCount();
return $this->numRows;
} catch (\PDOException $e) {
if ($this->isBreak($e)) {
return $this->close()->execute($sql, $bind);
return $this->close()->execute($sql, $bind, $query);
}
throw new PDOException($e, $this->config, $this->getLastsql());
} catch (\Throwable $e) {
if ($this->isBreak($e)) {
return $this->close()->execute($sql, $bind);
return $this->close()->execute($sql, $bind, $query);
}
throw $e;
} catch (\Exception $e) {
if ($this->isBreak($e)) {
return $this->close()->execute($sql, $bind);
return $this->close()->execute($sql, $bind, $query);
}
throw $e;
}

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

@@ -53,6 +53,8 @@ class Query
protected static $info = [];
// 回调事件
private static $event = [];
// 读取主库
private static $readMaster = [];
/**
* 构造函数
@@ -141,16 +143,20 @@ class Query
}
/**
* 设置模型从主库读取数据
* 设置后续从主库读取数据
* @access public
* @param bool $master
* @return void
*/
public function setModelReadMaster($master = true)
public function readMaster($master = true)
{
if ($this->model) {
$this->model->readMaster($master);
if ($master) {
$table = isset($this->options['table']) ? $this->options['table'] : $this->getTable();
static::$readMaster[$table] = true;
}
return $this;
}
/**
@@ -2936,6 +2942,10 @@ class Query
}
}
if (isset(static::$readMaster[$options['table']])) {
$options['master'] = true;
}
foreach (['join', 'union', 'group', 'having', 'limit', 'order', 'force', 'comment'] as $name) {
if (!isset($options[$name])) {
$options[$name] = '';