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

添加socketlog调试的支持

Browse Source
This commit is contained in:
upfy@qq.com
2015-12-08 09:57:32 +08:00
parent ca8da0d20c
commit dfb9a73bea
5 changed files with 511 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
library/think/db/driver.php
View File

@@ -17,6 +17,7 @@ use think\Debug;
use think\Exception;
use think\Lang;
use think\Log;
use think\slog;
abstract class Driver
{
@@ -742,14 +743,16 @@ abstract class Driver
protected function parseOrder($order)
{
$array = [];
foreach ($order as $key => $val) {
if (is_numeric($key)) {
if (false === strpos($val, '(')) {
$array[] = $this->parseKey($val);
if(is_array($order)) {
foreach ($order as $key => $val) {
if (is_numeric($key)) {
if (false === strpos($val, '(')) {
$array[] = $this->parseKey($val);
}
} else {
$sort = in_array(strtolower(trim($val)), ['asc', 'desc']) ? ' ' . $val : '';
$array[] = $this->parseKey($key) . ' ' . $sort;
}
} else {
$sort = in_array(strtolower(trim($val)), ['asc', 'desc']) ? ' ' . $val : '';
$array[] = $this->parseKey($key) . ' ' . $sort;
}
}
$order = implode(',', $array);
@@ -1159,6 +1162,11 @@ abstract class Driver
Log::record($this->queryStr . ' [ RunTime:' . Debug::getUseTime('queryStartTime', 'queryEndTime') . 's ]', 'SQL');
}
}
$slog_config=Config::get('slog');
if($slog_config['enable'] && $start) {
slog::sql($this->queryStr,$this->_linkID);
}
}
/**