Bug 1738 fixed : hour function doesn't exists for database other than…

… mysql. git-svn-id: http://piwigo.org/svn/trunk@6578 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jun 22, 2010 · 5a677f1 · 5a677f1
1 parent f4d4a3d
commit 5a677f1
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/admin/stats.php b/admin/stats.php
@@ -116,7 +116,7 @@ function get_summary($year = null, $month = null, $day = null)
 $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.'

diff --git a/include/dblayer/functions_mysql.inc.php b/include/dblayer/functions_mysql.inc.php
@@ -580,6 +580,11 @@ function pwg_db_get_recent_period($period, $date='CURRENT_DATE')
   return $d;
 }
 
+function pwg_db_get_hour($date) 
+{
+  return 'hour('.$date.')';
+}
+
 function pwg_db_get_date_YYYYMM($date)
 {
   return 'DATE_FORMAT('.$date.', \'%Y%m\')';

diff --git a/include/dblayer/functions_pdo-sqlite.inc.php b/include/dblayer/functions_pdo-sqlite.inc.php
@@ -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();

diff --git a/include/dblayer/functions_pgsql.inc.php b/include/dblayer/functions_pgsql.inc.php
@@ -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\')';

diff --git a/include/dblayer/functions_sqlite.inc.php b/include/dblayer/functions_sqlite.inc.php
@@ -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();