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

暂时先加上 单元测试test根命名空间注册

Browse Source
This commit is contained in:
thinkphp
2015-12-24 15:38:20 +08:00
parent 03bd5caf96
commit 2d00377a0b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/db.php
View File

@@ -17,9 +17,9 @@ namespace think;
class Db
{
// 数据库连接实例
private static $instance = [];
private static $instances = [];
// 当前数据库连接实例
private static $_instance = null;
private static $instance = null;
// 查询次数
public static $queryTimes = 0;
// 执行次数
@@ -36,15 +36,15 @@ class Db
public static function instance($config = [], $lite = false)
{
$md5 = md5(serialize($config));
if (!isset(self::$instance[$md5])) {
if (!isset(self::$instances[$md5])) {
// 解析连接参数 支持数组和字符串
$options = self::parseConfig($config);
// 如果采用lite方式 仅支持原生SQL 包括query和execute方法
$class = $lite ? '\\think\\db\\Lite' : '\\think\\db\\driver\\' . ucwords($options['type']);
self::$instance[$md5] = new $class($options);
$class = $lite ? '\\think\\db\\Lite' : '\\think\\db\\driver\\' . ucwords($options['type']);
self::$instances[$md5] = new $class($options);
}
self::$_instance = self::$instance[$md5];
return self::$_instance;
self::$instance = self::$instances[$md5];
return self::$instance;
}
/**
@@ -106,6 +106,6 @@ class Db
// 调用驱动类的方法
public static function __callStatic($method, $params)
{
return call_user_func_array([self::$_instance, $method], $params);
return call_user_func_array([self::$instance, $method], $params);
}
}

2
start.php
View File

@@ -46,6 +46,6 @@ if (APP_HOOK && isset($mode['tags'])) {
if (APP_AUTO_BUILD && is_file(APP_PATH . 'build.php')) {
Build::run(include APP_PATH . 'build.php');
}
Loader::addNamespace('tests', TEST_PATH);
// 执行应用
!IN_UNIT_TEST && App::run();