molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、更新tp5内核

Browse Source 
2、修复后台文档模型创建的bug
This commit is contained in:
molong
2016-08-05 17:32:10 +08:00
parent 4b09ebce88
commit bce968f5a3
12 changed files with 165 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/library/think/db/Builder.php
View File

@@ -83,7 +83,7 @@ abstract class Builder
}
// 获取绑定信息
$bind = $this->query->getTableInfo($options['table'], 'bind');
$bind = $this->query->getFieldsBind($options);
if ('*' == $options['field']) {
$fields = array_keys($bind);
} else {
@@ -228,8 +228,8 @@ abstract class Builder
$whereStr = '';
// 获取字段信息
$fields = $this->query->getTableInfo($options['table'], 'fields');
$binds = $this->query->getTableInfo($options['table'], 'bind');
$fields = $this->query->getTableFields($options);
$binds = $this->query->getFieldsBind($options);
foreach ($where as $key => $val) {
$str = [];
foreach ($val as $field => $value) {
@@ -369,10 +369,8 @@ abstract class Builder
protected function parseDateTime($value, $key, $options = [])
{
// 获取时间字段类型
$type = $this->query->getTableInfo($options['table'], 'type');
if (isset($options['field_type'][$key])) {
$info = $options['field_type'][$key];
} elseif (isset($type[$key])) {
$type = $this->query->getFieldsType($options);
if (isset($type[$key])) {
$info = $type[$key];
}
if (isset($info)) {
@@ -608,7 +606,7 @@ abstract class Builder
{
// 获取合法的字段
if ('*' == $options['field']) {
$fields = $this->query->getTableInfo($options['table'], 'fields');
$fields = $this->query->getFieldsType($options);
} else {
$fields = $options['field'];
}