archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug 1738 fixed : merge from trunk

Browse source 
hour function doesn't exists for database other than mysql.

git-svn-id: http://piwigo.org/svn/branches/2.1@6579 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2010-06-22 21:01:47 +00:00
parent 7629b2723a
commit 1661af7f3f
5 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/stats.php
View file

@ -116,7 +116,7 @@ check_status(ACCESS_ADMINISTRATOR);
$query = '
SELECT
date,
hour(time) AS hour,
'.pwg_db_get_hour('time').' AS hour,
MAX(id) AS max_id,
COUNT(*) AS nb_pages
FROM '.HISTORY_TABLE.'

5
include/dblayer/functions_mysql.inc.php
View file

@ -580,6 +580,11 @@ SELECT '.pwg_db_get_recent_period_expression($period);
return $d;
}
function pwg_db_get_hour($date)
{
return 'hour('.$date.')';
}
function pwg_db_get_date_YYYYMM($date)
{
return 'DATE_FORMAT('.$date.', \'%Y%m\')';

12
include/dblayer/functions_pdo-sqlite.inc.php
View file

@ -46,7 +46,6 @@ function pwg_db_connect($host, $user, $password, $database)
}
$link->sqliteCreateFunction('now', 'pwg_now', 0);
$link->sqliteCreateFunction('hour', 'pwg_hour', 1);
$link->sqliteCreateFunction('unix_timestamp', 'pwg_unix_timestamp', 0);
$link->sqliteCreateFunction('md5', 'md5', 1);
$link->sqliteCreateFunction('if', 'pwg_if', 3);
@ -502,6 +501,12 @@ function pwg_db_get_recent_period($period, $date='CURRENT_DATE')
return $d;
}
function pwg_db_get_hour($date)
{
return 'strftime(\'%H\', '.$date.')';
}
function pwg_db_get_date_YYYYMM($date)
{
return 'strftime(\'%Y%m\','.$date.')';
@ -571,11 +576,6 @@ function pwg_now()
return date('Y-m-d H:i:s');
}
function pwg_hour($datetime)
{
return strftime('%H', $datetime);
}
function pwg_unix_timestamp()
{
return time();

5
include/dblayer/functions_pgsql.inc.php
View file

@ -544,6 +544,11 @@ function pwg_db_get_recent_period($period, $date='CURRENT_DATE')
return $d;
}
function pwg_db_get_hour($date)
{
return 'EXTRACT(HOUR FROM '.$date.')';
}
function pwg_db_get_date_YYYYMM($date)
{
return 'TO_CHAR('.$date.', \'YYYYMM\')';

11
include/dblayer/functions_sqlite.inc.php
View file

@ -55,7 +55,6 @@ function pwg_db_connect($host, $user, $password, $database)
}
$link->createFunction('now', 'pwg_now', 0);
$link->createFunction('hour', 'pwg_hour', 1);
$link->createFunction('unix_timestamp', 'pwg_unix_timestamp', 0);
$link->createFunction('md5', 'md5', 1);
$link->createFunction('if', 'pwg_if', 3);
@ -514,6 +513,11 @@ function pwg_db_get_recent_period($period, $date='CURRENT_DATE')
return $d;
}
function pwg_db_get_hour($date)
{
return 'strftime(\'%H\', '.$date.')';
}
function pwg_db_get_date_YYYYMM($date)
{
return 'strftime(\'%Y%m\','.$date.')';
@ -583,11 +587,6 @@ function pwg_now()
return date('Y-m-d H:i:s');
}
function pwg_hour($datetime)
{
return strftime('%H', $datetime);
}
function pwg_unix_timestamp()
{
return time();