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

改进查询条件的自动参数绑定

Browse Source
This commit is contained in:
thinkphp
2016-09-13 12:26:22 +08:00
parent 6e96a6aac6
commit 633d0041c6
2 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
library/think/db/Builder.php
View File

@@ -222,6 +222,7 @@ abstract class Builder
} }
$whereStr = ''; $whereStr = '';
$binds = $this->query->getFieldsBind($options);
foreach ($where as $key => $val) { foreach ($where as $key => $val) {
$str = []; $str = [];
foreach ($val as $field => $value) { foreach ($val as $field => $value) {
@@ -235,7 +236,7 @@ abstract class Builder
$array = explode('|', $field); $array = explode('|', $field);
$item = []; $item = [];
foreach ($array as $k) { foreach ($array as $k) {
$item[] = $this->parseWhereItem($k, $value, '', $options); $item[] = $this->parseWhereItem($k, $value, '', $options, $binds);
} }
$str[] = ' ' . $key . ' ( ' . implode(' OR ', $item) . ' )'; $str[] = ' ' . $key . ' ( ' . implode(' OR ', $item) . ' )';
} elseif (strpos($field, '&')) { } elseif (strpos($field, '&')) {
@@ -243,13 +244,13 @@ abstract class Builder
$array = explode('&', $field); $array = explode('&', $field);
$item = []; $item = [];
foreach ($array as $k) { foreach ($array as $k) {
$item[] = $this->parseWhereItem($k, $value, '', $options); $item[] = $this->parseWhereItem($k, $value, '', $options, $binds);
} }
$str[] = ' ' . $key . ' ( ' . implode(' AND ', $item) . ' )'; $str[] = ' ' . $key . ' ( ' . implode(' AND ', $item) . ' )';
} else { } else {
// 对字段使用表达式查询 // 对字段使用表达式查询
$field = is_string($field) ? $field : ''; $field = is_string($field) ? $field : '';
$str[] = ' ' . $key . ' ' . $this->parseWhereItem($field, $value, $key, $options); $str[] = ' ' . $key . ' ' . $this->parseWhereItem($field, $value, $key, $options, $binds);
} }
} }
@@ -259,7 +260,7 @@ abstract class Builder
} }
// where子单元分析 // where子单元分析
protected function parseWhereItem($field, $val, $rule = '', $options = []) protected function parseWhereItem($field, $val, $rule = '', $options = [], $binds = [])
{ {
// 字段分析 // 字段分析
$key = $field ? $this->parseKey($field) : ''; $key = $field ? $this->parseKey($field) : '';
@@ -280,7 +281,7 @@ abstract class Builder
array_push($val, $item); array_push($val, $item);
} }
foreach ($val as $item) { foreach ($val as $item) {
$str[] = $this->parseWhereItem($key, $item, $rule, $options); $str[] = $this->parseWhereItem($field, $item, $rule, $options, $binds);
} }
return '( ' . implode(' ' . $rule . ' ', $str) . ' )'; return '( ' . implode(' ' . $rule . ' ', $str) . ' )';
} }
@@ -294,7 +295,11 @@ abstract class Builder
throw new Exception('where express error:' . $exp); throw new Exception('where express error:' . $exp);
} }
} }
$bindType = isset($binds[$field]) ? $binds[$field] : PDO::PARAM_STR;
if (is_scalar($value) && array_key_exists($field, $binds) && !in_array($exp, ['IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === 0 && strpos($value, ':') !== 0 && !$this->query->isBind($field)) {
$this->query->bind($field, $value, $bindType);
$value = ':' . $field;
}
$whereStr = ''; $whereStr = '';
if (in_array($exp, ['=', '<>', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE'])) { if (in_array($exp, ['=', '<>', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE'])) {
// 比较运算 及 模糊匹配 // 比较运算 及 模糊匹配
@@ -311,13 +316,21 @@ abstract class Builder
$whereStr .= $key . ' ' . $exp . ' ' . $this->parseClosure($value); $whereStr .= $key . ' ' . $exp . ' ' . $this->parseClosure($value);
} else { } else {
$value = is_array($value) ? $value : explode(',', $value); $value = is_array($value) ? $value : explode(',', $value);
$zone = implode(',', $this->parseValue($value, $field)); $bind = [];
$whereStr .= $key . ' ' . $exp . ' (' . $zone . ')'; $array = [];
foreach ($value as $k => $v) {
$bind[$field . '_in_' . $k] = [$v, $bindType];
$array[] = ':' . $field . '_in_' . $k;
}
$this->query->bind($bind);
$whereStr .= $key . ' ' . $exp . ' (' . implode(',', $array) . ')';
} }
} elseif (in_array($exp, ['NOT BETWEEN', 'BETWEEN'])) { } elseif (in_array($exp, ['NOT BETWEEN', 'BETWEEN'])) {
// BETWEEN 查询 // BETWEEN 查询
$data = is_array($value) ? $value : explode(',', $value); $data = is_array($value) ? $value : explode(',', $value);
$whereStr .= $key . ' ' . $exp . ' ' . $this->parseValue($data[0], $field) . ' AND ' . $this->parseValue($data[1], $field); $bind = [$field . '_between_1' => [$data[0], $bindType], $field . '_between_2' => [$data[1], $bindType]];
$this->query->bind($bind);
$whereStr .= $key . ' ' . $exp . ' :' . $field . '_between_1' . ' AND :' . $field . '_between_2';
} elseif (in_array($exp, ['NOT EXISTS', 'EXISTS'])) { } elseif (in_array($exp, ['NOT EXISTS', 'EXISTS'])) {
// EXISTS 查询 // EXISTS 查询
if ($value instanceof \Closure) { if ($value instanceof \Closure) {
@@ -326,12 +339,12 @@ abstract class Builder
$whereStr .= $exp . ' (' . $value . ')'; $whereStr .= $exp . ' (' . $value . ')';
} }
} elseif (in_array($exp, ['< TIME', '> TIME', '<= TIME', '>= TIME'])) { } elseif (in_array($exp, ['< TIME', '> TIME', '<= TIME', '>= TIME'])) {
$whereStr .= $key . ' ' . substr($exp, 0, 2) . ' ' . $this->parseDateTime($value, $field, $options); $whereStr .= $key . ' ' . substr($exp, 0, 2) . ' ' . $this->parseDateTime($value, $field, $options, $field, $bindType);
} elseif (in_array($exp, ['BETWEEN TIME', 'NOT BETWEEN TIME'])) { } elseif (in_array($exp, ['BETWEEN TIME', 'NOT BETWEEN TIME'])) {
if (is_string($value)) { if (is_string($value)) {
$value = explode(',', $value); $value = explode(',', $value);
} }
$whereStr .= $key . ' ' . substr($exp, 0, -4) . $this->parseDateTime($value[0], $field, $options) . ' AND ' . $this->parseDateTime($value[1], $field, $options); $whereStr .= $key . ' ' . substr($exp, 0, -4) . $this->parseDateTime($value[0], $field, $options, $field . '_between_1', $bindType) . ' AND ' . $this->parseDateTime($value[1], $field, $options, $field . '_between_2', $bindType);
} }
return $whereStr; return $whereStr;
} }
@@ -350,9 +363,11 @@ abstract class Builder
* @param string $value * @param string $value
* @param string $key * @param string $key
* @param array $options * @param array $options
* @param string $bindName
* @param integer $bindType
* @return string * @return string
*/ */
protected function parseDateTime($value, $key, $options = []) protected function parseDateTime($value, $key, $options = [], $bindName = null, $bindType = null)
{ {
// 获取时间字段类型 // 获取时间字段类型
$type = $this->query->getFieldsType($options); $type = $this->query->getFieldsType($options);
@@ -369,7 +384,9 @@ abstract class Builder
$value = date('Y-m-d', $value); $value = date('Y-m-d', $value);
} }
} }
return is_int($value) ? $value : $this->connection->quote($value); $bindName = $bindName ?: $key;
$this->query->bind($bindName, $value, $bindType);
return ':' . $bindName;
} }
/** /**

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

@@ -412,13 +412,17 @@ abstract class Connection
{ {
if ($bind) { if ($bind) {
foreach ($bind as $key => $val) { foreach ($bind as $key => $val) {
$val = $this->quote(is_array($val) ? $val[0] : $val); $value = is_array($val) ? $val[0] : $val;
$type = is_array($val) ? $val[1] : PDO::PARAM_STR;
if (PDO::PARAM_STR == $type) {
$value = $this->quote($value);
}
// 判断占位符 // 判断占位符
$sql = is_numeric($key) ? $sql = is_numeric($key) ?
substr_replace($sql, $val, strpos($sql, '?'), 1) : substr_replace($sql, $value, strpos($sql, '?'), 1) :
str_replace( str_replace(
[':' . $key . ')', ':' . $key . ',', ':' . $key . ' '], [':' . $key . ')', ':' . $key . ',', ':' . $key . ' '],
[$val . ')', $val . ',', $val . ' '], [$value . ')', $value . ',', $value . ' '],
$sql . ' '); $sql . ' ');
} }
} }