From 71fe1c09bc09d915feacea70f3fdfaf9c71cceb6 Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 23 Jan 2014 18:45:02 +0100 Subject: [PATCH] firefox log statistics fix, qq pg fix --- db/qq/QP.php | 3 ++- db/qq/QQ.php | 3 ++- dbd/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php | 8 +++++--- dbd/qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php | 21 +++++++++++++++------ dbd/qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php | 9 ++++----- dbd/qq/SYS_SAIMOD_LOG_CLASS_BASIC.php | 2 +- dbd/qq/SYS_SAIMOD_LOG_CLASS_OTHER.php | 2 +- dbd/qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php | 2 +- dbd/qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php | 22 +++++----------------- dbd/qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php | 10 +++++----- dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php | 10 +++++----- dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php | 2 +- 12 files changed, 47 insertions(+), 47 deletions(-) diff --git a/db/qq/QP.php b/db/qq/QP.php index b1aa37a..d134086 100644 --- a/db/qq/QP.php +++ b/db/qq/QP.php @@ -5,7 +5,8 @@ class QP { public static function QQ($params,$params_mys = null){ $query = static::query(); $con = new \SYSTEM\DB\Connection($query->dbinfo); - if($is_pg = \SYSTEM\system::isSystemDbInfoPG() && $query->dbinfo){ + $is_pg = \SYSTEM\system::isSystemDbInfoPG(); + if($query->dbinfo){ $is_pg = $query->dbinfo instanceof \SYSTEM\DB\DBInfoPG;} if($is_pg){ return $con->prepare($query->name,$query->sql_pg,$params); diff --git a/db/qq/QQ.php b/db/qq/QQ.php index e13823d..a58f26b 100644 --- a/db/qq/QQ.php +++ b/db/qq/QQ.php @@ -5,7 +5,8 @@ class QQ { public static function QQ(){ $query = static::query(); $con = new \SYSTEM\DB\Connection($query->dbinfo); - if($is_pg = \SYSTEM\system::isSystemDbInfoPG() && $query->dbinfo){ + $is_pg = \SYSTEM\system::isSystemDbInfoPG(); + if($query->dbinfo){ $is_pg = $query->dbinfo instanceof \SYSTEM\DB\DBInfoPG;} if($is_pg){ return $con->query($query->sql_pg); diff --git a/dbd/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php b/dbd/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php index 1756349..13f81e8 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php +++ b/dbd/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php @@ -5,10 +5,12 @@ class SYS_SAIMOD_LOG_BASIC_QUERYTIME extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' - .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique' + .'avg('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_avg,' + .'max('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_max,' + .'min('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_min,' + .'variance('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_var' .' FROM '.\SYSTEM\DBD\system_log::NAME_PG .' GROUP BY day' .' ORDER BY day DESC' diff --git a/dbd/qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php b/dbd/qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php index d654e1f..5a40b03 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php +++ b/dbd/qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php @@ -5,12 +5,21 @@ class SYS_SAIMOD_LOG_BASIC_SUCCESS extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' - .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_REFERER.') as http_referer_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_USER_AGENT.') as http_user_agent_unique' + .'sum(case when not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' and' + .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' and' + .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' and' + .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' and' + .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'EPRECATED\' ' + .'then 1 else 0 end) class_fail,' + .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' or ' + .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' or ' + .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' or ' + .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' or ' + .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'EPRECATED\' ' + .'then 1 else 0 end) class_log,' + .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' then 1 else 0 end) class_sucess' .' FROM '.\SYSTEM\DBD\system_log::NAME_PG .' GROUP BY day' .' ORDER BY day DESC' @@ -30,7 +39,7 @@ class SYS_SAIMOD_LOG_BASIC_SUCCESS extends \SYSTEM\DB\QP { .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' or ' .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'EPRECATED\' ' .'then 1 else 0 end) class_log,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' then 1 else 0 end) class_sucess' + .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' then 1 else 0 end) class_sucess' .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' diff --git a/dbd/qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php b/dbd/qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php index b78e33b..c4b2738 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php +++ b/dbd/qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php @@ -5,11 +5,10 @@ class SYS_SAIMOD_LOG_BASIC_VISITOR extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_FILE.') as file_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_LINE.') as line_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_CLASS.') as class_unique' + .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique' .' FROM '.\SYSTEM\DBD\system_log::NAME_PG .' GROUP BY day' .' ORDER BY day DESC' @@ -18,7 +17,7 @@ class SYS_SAIMOD_LOG_BASIC_VISITOR extends \SYSTEM\DB\QP { 'SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)) as day,' .'count(*) as count,' .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique' .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' diff --git a/dbd/qq/SYS_SAIMOD_LOG_CLASS_BASIC.php b/dbd/qq/SYS_SAIMOD_LOG_CLASS_BASIC.php index 6da3f0f..8baf74a 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_CLASS_BASIC.php +++ b/dbd/qq/SYS_SAIMOD_LOG_CLASS_BASIC.php @@ -5,7 +5,7 @@ class SYS_SAIMOD_LOG_CLASS_BASIC extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'ERROR\' then 1 else 0 end) class_ERROR,' .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WARNING\' then 1 else 0 end) class_WARNING,' diff --git a/dbd/qq/SYS_SAIMOD_LOG_CLASS_OTHER.php b/dbd/qq/SYS_SAIMOD_LOG_CLASS_OTHER.php index 96ea156..0f9a24c 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_CLASS_OTHER.php +++ b/dbd/qq/SYS_SAIMOD_LOG_CLASS_OTHER.php @@ -5,7 +5,7 @@ class SYS_SAIMOD_LOG_CLASS_OTHER extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'Exception\' then 1 else 0 end) class_Exception,' .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'RuntimeException\' then 1 else 0 end) class_RuntimeException,' diff --git a/dbd/qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php b/dbd/qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php index 9fc0eb2..7860d76 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php +++ b/dbd/qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php @@ -5,7 +5,7 @@ class SYS_SAIMOD_LOG_CLASS_SYSTEM extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' then 1 else 0 end) class_SYSTEM_LOG_COUNTER,' .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' then 1 else 0 end) class_SYSTEM_LOG_INFO,' diff --git a/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php b/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php index c7254e8..8530746 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php +++ b/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php @@ -5,23 +5,11 @@ class SYS_SAIMOD_LOG_UNIQUE_BASIC extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' - .'sum(case when not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'DEPRECATED\' and ' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'PreprocessingLog\' ' - .'then 1 else 0 end) class_fail,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'DEPRECATED\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'PreprocessingLog\' ' - .'then 1 else 0 end) class_log,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' then 1 else 0 end) class_sucess' + .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique' .' FROM '.\SYSTEM\DBD\system_log::NAME_PG .' GROUP BY day' .' ORDER BY day DESC' @@ -31,7 +19,7 @@ class SYS_SAIMOD_LOG_UNIQUE_BASIC extends \SYSTEM\DB\QP { .'count(*) as count,' .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique' .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' diff --git a/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php b/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php index e66810d..8a2101b 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php +++ b/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php @@ -5,11 +5,11 @@ class SYS_SAIMOD_LOG_UNIQUE_EXCEPTION extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' - .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_FILE.') as file_unique,' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_LINE.') as line_unique,' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_CLASS.') as class_unique' .' FROM '.\SYSTEM\DBD\system_log::NAME_PG .' GROUP BY day' .' ORDER BY day DESC' @@ -19,7 +19,7 @@ class SYS_SAIMOD_LOG_UNIQUE_EXCEPTION extends \SYSTEM\DB\QP { .'count(*) as count,' .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_FILE.') as file_unique,' .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_LINE.') as line_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_CLASS.') as class_unique' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_CLASS.') as class_unique' .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' diff --git a/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php b/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php index a516dfa..782e6f2 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php +++ b/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php @@ -5,12 +5,12 @@ class SYS_SAIMOD_LOG_UNIQUE_REFERER extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_PORT.') as server_port_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_REQUEST_URI.') as request_uri_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_POST.') as post_unique' + .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_REFERER.') as http_referer_unique,' + .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_USER_AGENT.') as http_user_agent_unique' .' FROM '.\SYSTEM\DBD\system_log::NAME_PG .' GROUP BY day' .' ORDER BY day DESC' diff --git a/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php b/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php index 00650f9..757c7af 100644 --- a/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php +++ b/dbd/qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php @@ -5,7 +5,7 @@ class SYS_SAIMOD_LOG_UNIQUE_REQUEST extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)) as day,' +'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,' .'count(*) as count,' .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique,' .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_PORT.') as server_port_unique,'