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

改进Response类 支持扩展不同的输出类型 改进Model类 不同的模型采用不同的查询对象实例 修正Request类一处错误 助手函数view改进 直接返回Response类对象实例

Browse Source
This commit is contained in:
thinkphp
2016-05-16 14:18:47 +08:00
parent 891c1f99f2
commit 199825ec32
15 changed files with 420 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,8 @@ abstract class Connection
protected $attrCase = PDO::CASE_LOWER;
// 监听回调
protected static $event = [];
// 查询对象
protected $query = [];
// 数据库连接参数配置
protected $config = [
// 数据库类型
@@ -119,7 +120,20 @@ abstract class Connection
if (!empty($config)) {
$this->config = array_merge($this->config, $config);
}
$this->query = new Query($this);
}
/**
* 创建指定模型的查询对象
* @access public
* @param string $model 模型类名称
* @return \think\Query
*/
public function model($model)
{
if (!isset($this->query[$model])) {
$this->query[$model] = new Query($this, $model);
}
return $this->query[$model];
}
/**
@@ -131,7 +145,10 @@ abstract class Connection
*/
public function __call($method, $args)
{
return call_user_func_array([$this->query, $method], $args);
if (!isset($this->query['database'])) {
$this->query['database'] = new Query($this);
}
return call_user_func_array([$this->query['database'], $method], $args);
}
/**

92
library/think/db/Query.php
View File

@@ -29,7 +29,12 @@ class Query
protected $connection;
// 数据库驱动类型
protected $driver;
// 当前模型类名称
protected $model;
// 当前数据表名称（含前缀）
protected $table;
// 当前数据表名称（不含前缀）
protected $name;
// 查询参数
protected $options = [];
// 参数绑定
@@ -41,10 +46,11 @@ class Query
* @param object|string $connection 数据库对象实例
* @throws Exception
*/
public function __construct($connection = '')
public function __construct($connection = '', $model = '')
{
$this->connection = $connection ?: Db::connect([], true);
$this->driver = $this->connection->getDriverName();
$this->model = $model;
}
/**
@@ -73,6 +79,39 @@ class Query
}
}
/**
* 执行查询 返回数据集
* @access public
* @param string $sql sql指令
* @param array $bind 参数绑定
* @param boolean $fetch 不执行只是获取SQL
* @param boolean $master 是否在主服务器读操作
* @param bool|string $class 指定返回的数据集对象
* @return mixed
* @throws DbBindParamException
* @throws PDOException
*/
public function query($sql, $bind = [], $fetch = false, $master = false, $class = false)
{
return $this->connection->query($sql, $bind, $fetch, $master, $class);
}
/**
* 执行语句
* @access public
* @param string $sql sql指令
* @param array $bind 参数绑定
* @param boolean $fetch 不执行只是获取SQL
* @param boolean $getLastInsID 是否获取自增ID
* @return int
* @throws DbBindParamException
* @throws PDOException
*/
public function execute($sql, $bind = [], $fetch = false, $getLastInsID = false)
{
return $this->connection->execute($sql, $bind, $fetch, $getLastInsID);
}
/**
* 获取当前的builder实例对象
* @access protected
@@ -677,7 +716,7 @@ class Query
*/
public function table($table)
{
$this->options['table'] = $table;
$this->table = $table;
return $this;
}
@@ -898,18 +937,6 @@ class Query
return $this;
}
/**
* 指定当前模型
* @access public
* @param string $model 模型类名称
* @return $this
*/
public function model($model)
{
$this->options['model'] = $model;
return $this;
}
/**
* 设置当前name
* @access public
@@ -918,7 +945,7 @@ class Query
*/
public function name($name)
{
$this->options['name'] = $name;
$this->name = $name;
return $this;
}
@@ -929,13 +956,13 @@ class Query
*/
public function getTable()
{
if (empty($this->options['table'])) {
if (empty($this->table)) {
$tableName = $this->connection->getConfig('prefix');
if (isset($this->options['name'])) {
$tableName .= Loader::parseName($this->options['name']);
if (isset($this->name)) {
$tableName .= Loader::parseName($this->name);
}
} else {
$tableName = $this->options['table'];
$tableName = $this->table;
}
return $tableName;
}
@@ -1059,7 +1086,7 @@ class Query
}
$i = 0;
$currentModel = $this->options['model'];
$currentModel = $this->model;
/** @var Model $class */
$class = new $currentModel;
@@ -1181,7 +1208,7 @@ class Query
// 生成SQL语句
$sql = $this->builder()->insert($data, $options, $replace);
// 执行操作
return $this->connection->execute($sql, $this->getBind(), $options['fetch_sql'], $getLastInsID);
return $this->execute($sql, $this->getBind(), $options['fetch_sql'], $getLastInsID);
}
/**
@@ -1212,7 +1239,7 @@ class Query
// 生成SQL语句
$sql = $this->builder()->insertAll($dataSet, $options);
// 执行操作
return $this->connection->execute($sql, $this->getBind(), $options['fetch_sql']);
return $this->execute($sql, $this->getBind(), $options['fetch_sql']);
}
/**
@@ -1230,7 +1257,7 @@ class Query
// 生成SQL语句
$sql = $this->builder()->selectInsert($fields, $table, $options);
// 执行操作
return $this->connection->execute($sql, $this->getBind(), $options['fetch_sql']);
return $this->execute($sql, $this->getBind(), $options['fetch_sql']);
}
/**
@@ -1275,7 +1302,7 @@ class Query
return 0;
}
// 执行操作
return $this->connection->execute($sql, $this->getBind(), $options['fetch_sql']);
return $this->execute($sql, $this->getBind(), $options['fetch_sql']);
}
/**
@@ -1316,7 +1343,7 @@ class Query
// 生成查询SQL
$sql = $this->builder()->select($options);
// 执行查询操作
$resultSet = $this->connection->query($sql, $this->getBind(), $options['fetch_sql'], $options['master'], $options['fetch_class']);
$resultSet = $this->query($sql, $this->getBind(), $options['fetch_sql'], $options['master'], $options['fetch_class']);
if (is_string($resultSet)) {
// 返回SQL
@@ -1337,9 +1364,9 @@ class Query
if ($resultSet) {
// 数据列表读取后的处理
if (!empty($options['model'])) {
if (!empty($this->model)) {
// 生成模型对象
$model = $options['model'];
$model = $this->model;
foreach ($resultSet as $key => $result) {
/** @var Model $result */
$result = new $model($result);
@@ -1397,7 +1424,7 @@ class Query
// 生成查询SQL
$sql = $this->builder()->select($options);
// 执行查询
$result = $this->connection->query($sql, $this->getBind(), $options['fetch_sql'], $options['master'], $options['fetch_class']);
$result = $this->query($sql, $this->getBind(), $options['fetch_sql'], $options['master'], $options['fetch_class']);
if (is_string($result)) {
// 返回SQL
@@ -1418,9 +1445,10 @@ class Query
// 数据处理
if (!empty($result[0])) {
$data = $result[0];
if (!empty($options['model'])) {
if (!empty($this->model)) {
// 返回模型对象
$data = new $options['model']($data);
$model = $this->model;
$data = new $model($data);
$data->isUpdate(true, isset($options['where']['AND']) ? $options['where']['AND'] : null);
// 关联查询
if (!empty($options['relation'])) {
@@ -1517,7 +1545,7 @@ class Query
// 生成删除SQL语句
$sql = $this->builder()->delete($options);
// 执行操作
return $this->connection->execute($sql, $this->getBind(), $options['fetch_sql']);
return $this->execute($sql, $this->getBind(), $options['fetch_sql']);
}
/**