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

Lite数据库类调整 数据库类的escapeString方法更名为quote

Browse Source
This commit is contained in:
thinkphp
2015-12-14 12:35:57 +08:00
parent e1c5769a30
commit 9fc6c38a4a
3 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/db/driver.php
View File

@@ -153,7 +153,7 @@ abstract class Driver
$this->queryStr = $str; $this->queryStr = $str;
if (!empty($this->bind)) { if (!empty($this->bind)) {
$that = $this; $that = $this;
$this->queryStr = strtr($this->queryStr, array_map(function ($val) use ($that) {return $that->escapeString($val);}, $this->bind)); $this->queryStr = strtr($this->queryStr, array_map(function ($val) use ($that) {return $that->quote($val);}, $this->bind));
} }
if ($fetchSql) { if ($fetchSql) {
return $this->queryStr; return $this->queryStr;
@@ -193,7 +193,6 @@ abstract class Driver
$this->error(); $this->error();
return false; return false;
} }
} }
/** /**
@@ -213,7 +212,7 @@ abstract class Driver
$this->queryStr = $str; $this->queryStr = $str;
if (!empty($this->bind)) { if (!empty($this->bind)) {
$that = $this; $that = $this;
$this->queryStr = strtr($this->queryStr, array_map(function ($val) use ($that) {return $that->escapeString($val);}, $this->bind)); $this->queryStr = strtr($this->queryStr, array_map(function ($val) use ($that) {return $that->quote($val);}, $this->bind));
} }
if ($fetchSql) { if ($fetchSql) {
return $this->queryStr; return $this->queryStr;
@@ -256,7 +255,6 @@ abstract class Driver
$this->error(); $this->error();
return false; return false;
} }
} }
/** /**
@@ -411,7 +409,7 @@ abstract class Driver
} elseif (is_scalar($val)) { } elseif (is_scalar($val)) {
// 过滤非标量数据 // 过滤非标量数据
if (0 === strpos($val, ':') && in_array($val, array_keys($this->bind))) { if (0 === strpos($val, ':') && in_array($val, array_keys($this->bind))) {
$set[] = $this->parseKey($key) . '=' . $this->escapeString($val); $set[] = $this->parseKey($key) . '=' . $this->quote($val);
} else { } else {
$name = count($this->bind); $name = count($this->bind);
$set[] = $this->parseKey($key) . '=:' . $name; $set[] = $this->parseKey($key) . '=:' . $name;
@@ -454,9 +452,9 @@ abstract class Driver
protected function parseValue($value) protected function parseValue($value)
{ {
if (is_string($value)) { if (is_string($value)) {
$value = strpos($value, ':') === 0 && in_array($value, array_keys($this->bind)) ? $value : $this->escapeString($value); $value = strpos($value, ':') === 0 && in_array($value, array_keys($this->bind)) ? $value : $this->quote($value);
} elseif (isset($value[0]) && is_string($value[0]) && strtolower($value[0]) == 'exp') { } elseif (isset($value[0]) && is_string($value[0]) && strtolower($value[0]) == 'exp') {
$value = $this->escapeString($value[1]); $value = $this->quote($value[1]);
} elseif (is_array($value)) { } elseif (is_array($value)) {
$value = array_map([$this, 'parseValue'], $value); $value = array_map([$this, 'parseValue'], $value);
} elseif (is_bool($value)) { } elseif (is_bool($value)) {
@@ -1127,9 +1125,9 @@ abstract class Driver
* @param string $str SQL字符串 * @param string $str SQL字符串
* @return string * @return string
*/ */
public function escapeString($str) public function quote($str)
{ {
return $this->_linkID->quote($str); return $this->_linkID ? $this->_linkID->quote($str) : $str;
} }
/** /**

84
library/think/db/lite.php
View File

@@ -89,7 +89,7 @@ class Lite
* 连接数据库方法 * 连接数据库方法
* @access public * @access public
*/ */
public function connect($config = '', $linkNum = 0) public function connect($config = '', $linkNum = 0,$autoConnection = false)
{ {
if (!isset($this->linkID[$linkNum])) { if (!isset($this->linkID[$linkNum])) {
if (empty($config)) { if (empty($config)) {
@@ -102,7 +102,12 @@ class Lite
} }
$this->linkID[$linkNum] = new PDO($config['dsn'], $config['username'], $config['password'], $config['params']); $this->linkID[$linkNum] = new PDO($config['dsn'], $config['username'], $config['password'], $config['params']);
} catch (\PDOException $e) { } catch (\PDOException $e) {
throw new Exception($e->getMessage()); if ($autoConnection) {
Log::record($e->getMessage(), 'ERR');
return $this->connect($autoConnection, $linkNum);
} elseif ($config['debug']) {
throw new Exception($e->getMessage());
}
} }
} }
return $this->linkID[$linkNum]; return $this->linkID[$linkNum];
@@ -121,19 +126,24 @@ class Lite
* 执行查询 返回数据集 * 执行查询 返回数据集
* @access public * @access public
* @param string $str sql指令 * @param string $str sql指令
* @param array $bind 参数绑定 * @param boolean $fetchSql 不执行只是获取SQL
* @param boolean $master 是否在主服务器读操作
* @return mixed * @return mixed
*/ */
public function query($str, $bind = []) public function query($str, $fetchSql = false, $master = false)
{ {
$this->initConnect(false); $this->initConnect($master);
if (!$this->_linkID) { if (!$this->_linkID) {
return false; return false;
} }
$this->queryStr = $str; $this->queryStr = $str;
if (!empty($bind)) { if (!empty($this->bind)) {
$this->queryStr .= '[ ' . print_r($bind, true) . ' ]'; $that = $this;
$this->queryStr = strtr($this->queryStr, array_map(function ($val) use ($that) {return $that->quote($val);}, $this->bind));
}
if ($fetchSql) {
return $this->queryStr;
} }
//释放前次的查询结果 //释放前次的查询结果
if (!empty($this->PDOStatement)) { if (!empty($this->PDOStatement)) {
@@ -148,13 +158,14 @@ class Lite
$this->error(); $this->error();
return false; return false;
} }
foreach ($bind as $key => $val) { foreach ($this->bind as $key => $val) {
if (is_array($val)) { if (is_array($val)) {
$this->PDOStatement->bindValue($key, $val[0], $val[1]); $this->PDOStatement->bindValue($key, $val[0], $val[1]);
} else { } else {
$this->PDOStatement->bindValue($key, $val); $this->PDOStatement->bindValue($key, $val);
} }
} }
$this->bind = [];
try { try {
$result = $this->PDOStatement->execute(); $result = $this->PDOStatement->execute();
// 调试结束 // 调试结束
@@ -175,10 +186,10 @@ class Lite
* 执行语句 * 执行语句
* @access public * @access public
* @param string $str sql指令 * @param string $str sql指令
* @param array $bind 参数绑定 * @param boolean $fetchSql 不执行只是获取SQL
* @return integer * @return integer
*/ */
public function execute($str, $bind = []) public function execute($str, $fetchSql = false)
{ {
$this->initConnect(true); $this->initConnect(true);
if (!$this->_linkID) { if (!$this->_linkID) {
@@ -186,8 +197,12 @@ class Lite
} }
$this->queryStr = $str; $this->queryStr = $str;
if (!empty($bind)) { if (!empty($this->bind)) {
$this->queryStr .= '[ ' . print_r($bind, true) . ' ]'; $that = $this;
$this->queryStr = strtr($this->queryStr, array_map(function ($val) use ($that) {return $that->quote($val);}, $this->bind));
}
if ($fetchSql) {
return $this->queryStr;
} }
//释放前次的查询结果 //释放前次的查询结果
if (!empty($this->PDOStatement)) { if (!empty($this->PDOStatement)) {
@@ -202,13 +217,14 @@ class Lite
$this->error(); $this->error();
return false; return false;
} }
foreach ($bind as $key => $val) { foreach ($this->bind as $key => $val) {
if (is_array($val)) { if (is_array($val)) {
$this->PDOStatement->bindValue($key, $val[0], $val[1]); $this->PDOStatement->bindValue($key, $val[0], $val[1]);
} else { } else {
$this->PDOStatement->bindValue($key, $val); $this->PDOStatement->bindValue($key, $val);
} }
} }
$this->bind = [];
try { try {
$result = $this->PDOStatement->execute(); $result = $this->PDOStatement->execute();
$this->debug(false); $this->debug(false);
@@ -226,6 +242,7 @@ class Lite
$this->error(); $this->error();
return false; return false;
} }
} }
/** /**
@@ -392,9 +409,9 @@ class Lite
* @param string $str SQL字符串 * @param string $str SQL字符串
* @return string * @return string
*/ */
public function escapeString($str) public function quote($str)
{ {
return addslashes($str); return $this->_linkID ? $this->_linkID->quote($str) : $str;
} }
/** /**
@@ -455,23 +472,23 @@ class Lite
*/ */
protected function multiConnect($master = false) protected function multiConnect($master = false)
{ {
static $_config = []; // 分布式数据库配置解析
if (empty($_config)) { $_config['username'] = explode(',', $this->config['username']);
// 缓存分布式数据库配置解析 $_config['password'] = explode(',', $this->config['password']);
$_config['username'] = explode(',', $$this->config['username']); $_config['hostname'] = explode(',', $this->config['hostname']);
$_config['password'] = explode(',', $$this->config['password']); $_config['hostport'] = explode(',', $this->config['hostport']);
$_config['hostname'] = explode(',', $$this->config['hostname']); $_config['database'] = explode(',', $this->config['database']);
$_config['hostport'] = explode(',', $$this->config['hostport']); $_config['dsn'] = explode(',', $this->config['dsn']);
$_config['database'] = explode(',', $$this->config['database']); $_config['charset'] = explode(',', $this->config['charset']);
$_config['dsn'] = explode(',', $$this->config['dsn']);
} $m = floor(mt_rand(0, $this->config['master_num'] - 1));
// 数据库读写是否分离 // 数据库读写是否分离
if ($this->config['rw_separate']) { if ($this->config['rw_separate']) {
// 主从式采用读写分离 // 主从式采用读写分离
if ($master) if ($master)
// 主服务器写入 // 主服务器写入
{ {
$r = floor(mt_rand(0, $this->config['master_num'] - 1)); $r = $m;
} else { } else {
if (is_numeric($this->config['slave_no'])) { if (is_numeric($this->config['slave_no'])) {
// 指定服务器读 // 指定服务器读
@@ -485,6 +502,18 @@ class Lite
// 读写操作不区分服务器 // 读写操作不区分服务器
$r = floor(mt_rand(0, count($_config['hostname']) - 1)); // 每次随机连接的数据库 $r = floor(mt_rand(0, count($_config['hostname']) - 1)); // 每次随机连接的数据库
} }
if ($m != $r) {
$db_master = [
'username' => isset($_config['username'][$m]) ? $_config['username'][$m] : $_config['username'][0],
'password' => isset($_config['password'][$m]) ? $_config['password'][$m] : $_config['password'][0],
'hostname' => isset($_config['hostname'][$m]) ? $_config['hostname'][$m] : $_config['hostname'][0],
'hostport' => isset($_config['hostport'][$m]) ? $_config['hostport'][$m] : $_config['hostport'][0],
'database' => isset($_config['database'][$m]) ? $_config['database'][$m] : $_config['database'][0],
'dsn' => isset($_config['dsn'][$m]) ? $_config['dsn'][$m] : $_config['dsn'][0],
'charset' => isset($_config['charset'][$m]) ? $_config['charset'][$m] : $_config['charset'][0],
];
}
$db_config = [ $db_config = [
'username' => isset($_config['username'][$r]) ? $_config['username'][$r] : $_config['username'][0], 'username' => isset($_config['username'][$r]) ? $_config['username'][$r] : $_config['username'][0],
'password' => isset($_config['password'][$r]) ? $_config['password'][$r] : $_config['password'][0], 'password' => isset($_config['password'][$r]) ? $_config['password'][$r] : $_config['password'][0],
@@ -492,8 +521,9 @@ class Lite
'hostport' => isset($_config['hostport'][$r]) ? $_config['hostport'][$r] : $_config['hostport'][0], 'hostport' => isset($_config['hostport'][$r]) ? $_config['hostport'][$r] : $_config['hostport'][0],
'database' => isset($_config['database'][$r]) ? $_config['database'][$r] : $_config['database'][0], 'database' => isset($_config['database'][$r]) ? $_config['database'][$r] : $_config['database'][0],
'dsn' => isset($_config['dsn'][$r]) ? $_config['dsn'][$r] : $_config['dsn'][0], 'dsn' => isset($_config['dsn'][$r]) ? $_config['dsn'][$r] : $_config['dsn'][0],
'charset' => isset($_config['charset'][$r]) ? $_config['charset'][$r] : $_config['charset'][0],
]; ];
return $this->connect($db_config, $r); return $this->connect($db_config, $r, $r == $m ? false : $db_master);
} }
/** /**

2
library/think/model.php
View File

@@ -1206,7 +1206,7 @@ class Model
$parse = func_get_args(); $parse = func_get_args();
array_shift($parse); array_shift($parse);
} }
$parse = array_map([$this->db, 'escapeString'], $parse); $parse = array_map([$this->db, 'quote'], $parse);
$where = vsprintf($where, $parse); $where = vsprintf($where, $parse);
} elseif (is_object($where)) { } elseif (is_object($where)) {
$where = get_object_vars($where); $where = get_object_vars($where);