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

修正Query类的gettableinfo方法

Browse Source
This commit is contained in:
thinkphp
2016-06-20 10:56:30 +08:00
parent ff16a4521d
commit 1e6cd85c04
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,8 @@ class Query
protected $options = [];
// 参数绑定
protected $bind = [];
// 数据表信息
protected $info = [];
/**
* 架构函数
@@ -1284,7 +1286,6 @@ class Query
*/
public function getTableInfo($tableName = '', $fetch = '')
{
static $_info = [];
if (!$tableName) {
$tableName = $this->getTable();
}
@@ -1299,8 +1300,8 @@ class Query
$tableName = $this->parseSqlTable($tableName);
}
$guid = md5($tableName);
if (!isset($_info[$guid])) {
$guid = $tableName;
if (!isset($this->info[$guid])) {
$info = $this->connection->getFields($tableName);
$fields = array_keys($info);
$bind = $type = [];
@@ -1324,10 +1325,9 @@ class Query
} else {
$pk = null;
}
$result = ['fields' => $fields, 'type' => $type, 'bind' => $bind, 'pk' => $pk];
$_info[$guid] = $result;
$this->info[$guid] = ['fields' => $fields, 'type' => $type, 'bind' => $bind, 'pk' => $pk];
}
return $fetch ? $_info[$guid][$fetch] : $_info[$guid];
return $fetch ? $this->info[$guid][$fetch] : $this->info[$guid];
}
/**