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

改进断线重连

Browse Source
This commit is contained in:
thinkphp
2018-10-30 11:10:05 +08:00
parent 42d0137a0c
commit 94ecaa13c4
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,14 +361,9 @@ abstract class Connection
// 调试开始 // 调试开始
$this->debug(true); $this->debug(true);
// 释放前次的查询结果
if (!empty($this->PDOStatement)) {
$this->free();
}
// 预处理 // 预处理
if (empty($this->PDOStatement)) { $this->PDOStatement = $this->linkID->prepare($sql);
$this->PDOStatement = $this->linkID->prepare($sql);
}
// 是否为存储过程调用 // 是否为存储过程调用
$procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']); $procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']);
// 参数绑定 // 参数绑定
@@ -429,14 +424,9 @@ abstract class Connection
// 调试开始 // 调试开始
$this->debug(true); $this->debug(true);
//释放前次的查询结果
if (!empty($this->PDOStatement) && $this->PDOStatement->queryString != $sql) {
$this->free();
}
// 预处理 // 预处理
if (empty($this->PDOStatement)) { $this->PDOStatement = $this->linkID->prepare($sql);
$this->PDOStatement = $this->linkID->prepare($sql);
}
// 是否为存储过程调用 // 是否为存储过程调用
$procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']); $procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']);
// 参数绑定 // 参数绑定
@@ -659,18 +649,15 @@ abstract class Connection
); );
} }
} catch (\PDOException $e) {
if ($this->isBreak($e)) {
return $this->close()->startTrans();
}
throw $e;
} catch (\Exception $e) { } catch (\Exception $e) {
if ($this->isBreak($e)) { if ($this->isBreak($e)) {
--$this->transTimes;
return $this->close()->startTrans(); return $this->close()->startTrans();
} }
throw $e; throw $e;
} catch (\Error $e) { } catch (\Error $e) {
if ($this->isBreak($e)) { if ($this->isBreak($e)) {
--$this->transTimes;
return $this->close()->startTrans(); return $this->close()->startTrans();
} }
throw $e; throw $e;
@@ -804,6 +791,8 @@ abstract class Connection
$this->linkWrite = null; $this->linkWrite = null;
$this->linkRead = null; $this->linkRead = null;
$this->links = []; $this->links = [];
// 释放查询
$this->free();
return $this; return $this;
} }