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

改进参数绑定机制 原生查询也可以支持参数绑定，并且同时支持 命名占位符和问号占位符 改进Driver类的异常处理 废除error方法

Browse Source 
模型类中使用bind方法如下：
// 命名占位符
$this->bind('name','value');
// 问号占位符
$this->bind(1,'value');
This commit is contained in:
thinkphp
2016-01-21 17:37:10 +08:00
parent 0a323bc879
commit c3412cfb12
4 changed files with 125 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
library/think/db/driver/Mongo.php
View File

@@ -14,7 +14,6 @@ namespace think\db\driver;
use think\db\Driver;
use think\Exception;
use think\Lang;
use think\Log;
/**
* Mongo数据库驱动
@@ -69,7 +68,7 @@ class Mongo extends Driver
$host = 'mongodb://' . ($config['username'] ? "{$config['username']}" : '') . ($config['password'] ? ":{$config['password']}@" : '') . $config['hostname'] . ($config['hostport'] ? ":{$config['hostport']}" : '') . '/' . ($config['database'] ? "{$config['database']}" : '');
try {
$this->linkID[$linkNum] = new \mongoClient($host, !empty($this->config['params'])?$this->config['params']:array());
$this->linkID[$linkNum] = new \mongoClient($host, !empty($this->config['params']) ? $this->config['params'] : array());
} catch (\MongoConnectionException $e) {
throw new Exception($e->getmessage());
}
@@ -94,7 +93,7 @@ class Mongo extends Driver
$this->initConnect($master);
}
$db = $db?$db:$this->config['database'];
$db = $db ? $db : $this->config['database'];
try {
if (!empty($db)) {
@@ -191,11 +190,10 @@ class Mongo extends Driver
* @access public
* @return string
*/
public function error()
public function getError()
{
$this->error = $this->_mongo->lastError();
Log::record($this->error, 'error');
return $this->error;
$error = $this->_mongo->lastError();
return $error;
}
/**
@@ -482,8 +480,8 @@ class Mongo extends Driver
}
$this->model = $options['model'];
$this->queryTimes++;
$query = $this->parseWhere(!empty($options['where'])?$options['where']:'');
$fields = $this->parseField(!empty($options['field'])?$options['field']:'');
$query = $this->parseWhere(!empty($options['where']) ? $options['where'] : '');
$fields = $this->parseField(!empty($options['field']) ? $options['field'] : '');
if ($this->config['debug']) {
$this->queryStr = $this->_dbName . '.' . $this->_collectionName . '.findOne(';
$this->queryStr .= $query ? json_encode($query) : '{}';
@@ -637,7 +635,7 @@ class Mongo extends Driver
*/
protected function parseOrder($order)
{
if(is_array($order)) {
if (is_array($order)) {
$order = join(',', $order);
}
if (is_string($order)) {
@@ -742,14 +740,14 @@ class Mongo extends Driver
{
$query = [];
switch ($key) {
case '_query': // 字符串模式查询条件
case '_query': // 字符串模式查询条件
parse_str($val, $query);
if (isset($query['_logic']) && strtolower($query['_logic']) == 'or') {
unset($query['_logic']);
$query['$or'] = $query;
}
break;
case '_string': // MongoCode查询
case '_string': // MongoCode查询
$query['$where'] = new \MongoCode($val);
break;
}