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

Model类实例化Db类的方法改变

Browse Source
This commit is contained in:
thinkphp
2013-03-30 13:30:55 +08:00
parent 97f9395a96
commit 2602e1622b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Think/Db.php
View File

@@ -35,12 +35,12 @@ class Db {
$class = $lite? 'Think\Db\Lite' : 'Think\\Db\\Driver\\'.ucwords($options['dbms']); $class = $lite? 'Think\Db\Lite' : 'Think\\Db\\Driver\\'.ucwords($options['dbms']);
if(class_exists($class)) { if(class_exists($class)) {
self::$instance[$md5] = new $class($options); self::$instance[$md5] = new $class($options);
self::$_instance = self::$instance[$md5];
}else{ }else{
Error::halt('_DB_TYPE_INVALID_:'.$options['dbms']); Error::halt('_DB_TYPE_INVALID_:'.$options['dbms']);
} }
} }
return self::$instance[$md5]; self::$_instance = self::$instance[$md5];
return self::$_instance;
} }
/** /**

2
Think/Model.php
View File

@@ -781,7 +781,7 @@ class Model {
if(!empty($config) && is_string($config) && false === strpos($config,'/')) { // 支持读取配置参数 if(!empty($config) && is_string($config) && false === strpos($config,'/')) { // 支持读取配置参数
$config = Config::get($config); $config = Config::get($config);
} }
$_db[$linkNum] = Db::getInstance($config); $_db[$linkNum] = Db::instance($config);
}elseif(NULL === $config){ }elseif(NULL === $config){
$_db[$linkNum]->close(); // 关闭数据库连接 $_db[$linkNum]->close(); // 关闭数据库连接
unset($_db[$linkNum]); unset($_db[$linkNum]);