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

改进Model类和Query类 name方法纳入链式操作 查询完成后释放 原来Connection类的getTableInfo方法移入 Query类

Browse Source
This commit is contained in:
thinkphp
2016-04-25 13:35:46 +08:00
parent 964248a10e
commit a9577009f8
9 changed files with 123 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ abstract class Builder
}
// 获取绑定信息
$bind = $this->connection->getTableInfo($options['table'], 'bind');
$bind = $this->query->getTableInfo($options['table'], 'bind');
if ('*' == $options['field']) {
$fields = array_keys($bind);
} else {
@@ -223,8 +223,8 @@ abstract class Builder
$whereStr = '';
// 获取字段信息
$fields = $this->connection->getTableInfo($table, 'fields');
$binds = $this->connection->getTableInfo($table, 'bind');
$fields = $this->query->getTableInfo($table, 'fields');
$binds = $this->query->getTableInfo($table, 'bind');
foreach ($where as $key => $val) {
$str = [];
foreach ($val as $field => $value) {
@@ -564,7 +564,7 @@ abstract class Builder
{
// 获取合法的字段
if ('*' == $options['field']) {
$fields = $this->connection->getTableInfo($options['table'], 'fields');
$fields = $this->query->getTableInfo($options['table'], 'fields');
} else {
$fields = is_array($options['field']) ? $options['field'] : explode(',', $options['field']);
}