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

改进数据表的前缀设置

Browse Source
This commit is contained in:
thinkphp
2015-02-25 10:50:58 +08:00
parent c6395bc3bf
commit 9e44381f6f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base.php
View File

@@ -90,7 +90,7 @@ function G($start,$end='',$dec=6) {
* @return Model * @return Model
*/ */
function M($name='', $tablePrefix='',$connection='') { function M($name='', $tablePrefix='',$connection='') {
return think\Loader::table($name,['table_prefix'=>$tablePrefix,'connection'=>$connection]); return think\Loader::table($name,['prefix'=>$tablePrefix,'connection'=>$connection]);
} }
/** /**

2
library/think/model.php
View File

@@ -69,6 +69,8 @@ class Model {
if(isset($config['prefix'])) { if(isset($config['prefix'])) {
$this->tablePrefix = $config['prefix']; $this->tablePrefix = $config['prefix'];
}else{
$this->tablePrefix = Config::get('database.prefix');
} }
if(isset($config['connection'])) { if(isset($config['connection'])) {
$this->connection = $config['connection']; $this->connection = $config['connection'];