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

改进\think\db\Driver类

Browse Source
This commit is contained in:
thinkphp
2016-01-21 18:25:24 +08:00
parent 400e680c6a
commit e006d40bdd
1 changed files with 38 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
library/think/db/Driver.php
View File

@@ -125,7 +125,7 @@ abstract class Driver
if ($autoConnection) { if ($autoConnection) {
Log::record($e->getMessage(), 'error'); Log::record($e->getMessage(), 'error');
return $this->connect($autoConnection, $linkNum); return $this->connect($autoConnection, $linkNum);
} elseif ($config['debug']) { } else {
throw new Exception($e->getMessage()); throw new Exception($e->getMessage());
} }
} }
@@ -154,22 +154,26 @@ abstract class Driver
/** /**
* 执行查询 返回数据集 * 执行查询 返回数据集
* @access public * @access public
* @param string $str sql指令 * @param string $sql sql指令
* @param array $bind 参数绑定 * @param array $bind 参数绑定
* @param boolean $fetchSql 不执行只是获取SQL * @param boolean $fetch 不执行只是获取SQL
* @param boolean $master 是否在主服务器读操作 * @param boolean $master 是否在主服务器读操作
* @return mixed * @return mixed
*/ */
public function query($str, $bind = [], $fetchSql = false, $master = false) public function query($sql, $bind = [], $fetch = false, $master = false)
{ {
$this->initConnect($master); $this->initConnect($master);
if (!$this->_linkID) { if (!$this->_linkID) {
return false; return false;
} }
$this->queryStr = $str; $this->queryStr = $sql;
if ($fetchSql) {
return $this->getBindSql($this->queryStr, $bind); if ($bind) {
$this->queryStr .= '[ ' . print_r($bind, true) . ' ]';
}
if ($fetch) {
return $this->queryStr;
} }
//释放前次的查询结果 //释放前次的查询结果
if (!empty($this->PDOStatement)) { if (!empty($this->PDOStatement)) {
@@ -181,7 +185,7 @@ abstract class Driver
// 调试开始 // 调试开始
$this->debug(true); $this->debug(true);
// 预处理 // 预处理
$this->PDOStatement = $this->_linkID->prepare($str); $this->PDOStatement = $this->_linkID->prepare($sql);
// 参数绑定 // 参数绑定
$this->bindValue($bind); $this->bindValue($bind);
// 执行查询 // 执行查询
@@ -197,21 +201,25 @@ abstract class Driver
/** /**
* 执行语句 * 执行语句
* @access public * @access public
* @param string $str sql指令 * @param string $sql sql指令
* @param array $bind 参数绑定 * @param array $bind 参数绑定
* @param boolean $fetchSql 不执行只是获取SQL * @param boolean $fetch 不执行只是获取SQL
* @return integer * @return integer
*/ */
public function execute($str, $bind = [], $fetchSql = false) public function execute($sql, $bind = [], $fetch = false)
{ {
$this->initConnect(true); $this->initConnect(true);
if (!$this->_linkID) { if (!$this->_linkID) {
return false; return false;
} }
$this->queryStr = $str; $this->queryStr = $sql;
if ($fetchSql) {
return $this->getBindSql($this->queryStr, $bind); if ($bind) {
$this->queryStr .= '[ ' . print_r($bind, true) . ' ]';
}
if ($fetch) {
return $this->queryStr;
} }
//释放前次的查询结果 //释放前次的查询结果
if (!empty($this->PDOStatement)) { if (!empty($this->PDOStatement)) {
@@ -223,7 +231,7 @@ abstract class Driver
// 调试开始 // 调试开始
$this->debug(true); $this->debug(true);
// 预处理 // 预处理
$this->PDOStatement = $this->_linkID->prepare($str); $this->PDOStatement = $this->_linkID->prepare($sql);
// 参数绑定操作 // 参数绑定操作
$this->bindValue($bind); $this->bindValue($bind);
// 执行语句 // 执行语句
@@ -232,7 +240,7 @@ abstract class Driver
$this->debug(false); $this->debug(false);
$this->numRows = $this->PDOStatement->rowCount(); $this->numRows = $this->PDOStatement->rowCount();
if (preg_match("/^\s*(INSERT\s+INTO|REPLACE\s+INTO)\s+/i", $str)) { if (preg_match("/^\s*(INSERT\s+INTO|REPLACE\s+INTO)\s+/i", $sql)) {
$this->lastInsID = $this->_linkID->lastInsertId(); $this->lastInsID = $this->_linkID->lastInsertId();
} }
return $this->numRows; return $this->numRows;
@@ -241,23 +249,6 @@ abstract class Driver
} }
} }
protected function getBindSql($sql, array $bind = [])
{
if ($bind) {
foreach ($bind as $key => $val) {
// 占位符
$val = is_array($val) ? $val[0] : $val;
if (is_numeric($key)) {
// 问号占位符
$sql = substr_replace($sql, $val, strpos($sql, '?'), 1);
} else {
$sql = str_replace(':' . $key, $val, $sql);
}
}
}
return $sql;
}
/** /**
* 参数绑定 * 参数绑定
* 支持 ['name'=>'value','id'=>123] 对应命名占位符 * 支持 ['name'=>'value','id'=>123] 对应命名占位符
@@ -527,7 +518,6 @@ abstract class Driver
} else { } else {
$array[] = $this->parseKey($alias); $array[] = $this->parseKey($alias);
} }
} }
$tables = $array; $tables = $array;
} elseif (is_string($tables)) { } elseif (is_string($tables)) {
@@ -622,9 +612,6 @@ abstract class Driver
} else { } else {
$whereStr .= $key . ' ' . $this->exp[$exp] . ' ' . $this->parseValue($val[1]); $whereStr .= $key . ' ' . $this->exp[$exp] . ' ' . $this->parseValue($val[1]);
} }
} elseif ('bind' == $exp) {
// 使用表达式
$whereStr .= $key . ' = :' . $val[1];
} elseif ('exp' == $exp) { } elseif ('exp' == $exp) {
// 使用表达式 // 使用表达式
$whereStr .= $key . ' ' . $val[1]; $whereStr .= $key . ' ' . $val[1];
@@ -836,17 +823,6 @@ abstract class Driver
return implode(' ', $sql); return implode(' ', $sql);
} }
/**
* 参数绑定分析
* @access protected
* @param array $bind
* @return array
*/
protected function parseBind($bind)
{
$this->bind = array_merge($this->bind, $bind);
}
/** /**
* index分析，可在操作链中指定需要强制使用的索引 * index分析，可在操作链中指定需要强制使用的索引
* @access protected * @access protected
@@ -889,7 +865,8 @@ abstract class Driver
{ {
$values = $fields = []; $values = $fields = [];
$this->model = $options['model']; $this->model = $options['model'];
$this->parseBind(!empty($options['bind']) ? $options['bind'] : []); $this->bind = array_merge($this->bind, !empty($options['bind']) ? $options['bind'] : []);
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
if (isset($val[0]) && 'exp' == $val[0]) { if (isset($val[0]) && 'exp' == $val[0]) {
$fields[] = $this->parseKey($key); $fields[] = $this->parseKey($key);
@@ -931,9 +908,8 @@ abstract class Driver
if (!is_array($dataSet[0])) { if (!is_array($dataSet[0])) {
return false; return false;
} }
$this->bind = array_merge($this->bind, !empty($options['bind']) ? $options['bind'] : []);
$this->parseBind(!empty($options['bind']) ? $options['bind'] : []); $fields = array_map([$this, 'parseKey'], array_keys($dataSet[0]));
$fields = array_map([$this, 'parseKey'], array_keys($dataSet[0]));
foreach ($dataSet as $data) { foreach ($dataSet as $data) {
$value = []; $value = [];
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
@@ -969,7 +945,7 @@ abstract class Driver
public function selectInsert($fields, $table, $options = []) public function selectInsert($fields, $table, $options = [])
{ {
$this->model = $options['model']; $this->model = $options['model'];
$this->parseBind(!empty($options['bind']) ? $options['bind'] : []); $this->bind = array_merge($this->bind, !empty($options['bind']) ? $options['bind'] : []);
if (is_string($fields)) { if (is_string($fields)) {
$fields = explode(',', $fields); $fields = explode(',', $fields);
} }
@@ -990,9 +966,9 @@ abstract class Driver
public function update($data, $options) public function update($data, $options)
{ {
$this->model = $options['model']; $this->model = $options['model'];
$this->parseBind(!empty($options['bind']) ? $options['bind'] : []); $this->bind = array_merge($this->bind, !empty($options['bind']) ? $options['bind'] : []);
$table = $this->parseTable($options['table']); $table = $this->parseTable($options['table']);
$sql = 'UPDATE ' . $table . $this->parseSet($data); $sql = 'UPDATE ' . $table . $this->parseSet($data);
if (strpos($table, ',')) { if (strpos($table, ',')) {
// 多表更新支持JOIN操作 // 多表更新支持JOIN操作
$sql .= $this->parseJoin(!empty($options['join']) ? $options['join'] : ''); $sql .= $this->parseJoin(!empty($options['join']) ? $options['join'] : '');
@@ -1016,9 +992,9 @@ abstract class Driver
public function delete($options = []) public function delete($options = [])
{ {
$this->model = $options['model']; $this->model = $options['model'];
$this->parseBind(!empty($options['bind']) ? $options['bind'] : []); $this->bind = array_merge($this->bind, !empty($options['bind']) ? $options['bind'] : []);
$table = $this->parseTable($options['table']); $table = $this->parseTable($options['table']);
$sql = 'DELETE FROM ' . $table; $sql = 'DELETE FROM ' . $table;
if (strpos($table, ',')) { if (strpos($table, ',')) {
// 多表删除支持USING和JOIN操作 // 多表删除支持USING和JOIN操作
if (!empty($options['using'])) { if (!empty($options['using'])) {
@@ -1045,9 +1021,9 @@ abstract class Driver
public function select($options = []) public function select($options = [])
{ {
$this->model = $options['model']; $this->model = $options['model'];
$this->parseBind(!empty($options['bind']) ? $options['bind'] : []); $this->bind = array_merge($this->bind, !empty($options['bind']) ? $options['bind'] : []);
$sql = $this->buildSelectSql($options); $sql = $this->buildSelectSql($options);
$result = $this->query($sql, $this->getBindParams(true), !empty($options['fetch_sql']) ? true : false, !empty($options['master']) ? true : false); $result = $this->query($sql, $this->getBindParams(true), !empty($options['fetch_sql']) ? true : false, !empty($options['master']) ? true : false);
return $result; return $result;
} }