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

修正 model类的alias方法

Browse Source
This commit is contained in:
thinkphp
2016-01-14 15:04:34 +08:00
parent 459339b61b
commit 45701c6a57
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Model.php
View File

@@ -756,9 +756,6 @@ class Model
$options = array_merge($this->options, $options); $options = array_merge($this->options, $options);
} }
if (!empty($options['alias'])) {
$options['table'] .= ' ' . $options['alias'];
}
// 记录操作的模型名称 // 记录操作的模型名称
$options['model'] = $this->name; $options['model'] = $this->name;
@@ -770,6 +767,9 @@ class Model
$options['table'] = $this->getTableName(); $options['table'] = $this->getTableName();
$fields = $this->getDbFields(); $fields = $this->getDbFields();
} }
if (!empty($options['alias'])) {
$options['table'] .= ' ' . $options['alias'];
}
// 字段类型验证 // 字段类型验证
if (isset($options['where']) && is_array($options['where']) && !empty($fields)) { if (isset($options['where']) && is_array($options['where']) && !empty($fields)) {
// 对数组查询条件进行字段类型检查 // 对数组查询条件进行字段类型检查

4
library/think/db/driver/Mysql.php
View File

@@ -43,7 +43,6 @@ class Mysql extends Driver
* 取得数据表的字段信息 * 取得数据表的字段信息
* @access public * @access public
* @param $tableName * @param $tableName
*
* @return array * @return array
*/ */
public function getFields($tableName) public function getFields($tableName)
@@ -71,9 +70,7 @@ class Mysql extends Driver
/** /**
* 取得数据库的表信息 * 取得数据库的表信息
* @access public * @access public
*
* @param string $dbName * @param string $dbName
*
* @return array * @return array
*/ */
public function getTables($dbName = '') public function getTables($dbName = '')
@@ -107,7 +104,6 @@ class Mysql extends Driver
return $key; return $key;
} }
/** /**
* 随机排序 * 随机排序
* @access protected * @access protected