Bug 1717 fixed : SQLite: access failure on Admin > Tools > History

hour function doesn't exists
Merge from trunk.

git-svn-id: http://piwigo.org/svn/branches/2.1@6464 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 17 insertions, 2 deletions

diff --git a/admin/stats.php b/admin/stats.php
index b693ebcaa..1ce07649a 100644
--- a/admin/stats.php
+++ b/admin/stats.php
@@ -116,14 +116,17 @@ check_status(ACCESS_ADMINISTRATOR);
 $query = '
 SELECT
     date,
-    HOUR(time) AS hour,
+    hour(time) AS hour,
     MAX(id) AS max_id,
     COUNT(*) AS nb_pages
   FROM '.HISTORY_TABLE.'
   WHERE summarized = \'false\'
   GROUP BY
+    date,
+    hour
+  ORDER BY
     date ASC,
-    HOUR(time) ASC
+    hour ASC
 ;';
 $result = pwg_query($query);
 
diff --git a/include/dblayer/functions_pdo-sqlite.inc.php b/include/dblayer/functions_pdo-sqlite.inc.php
index a1f0a7833..365083f0c 100644
--- a/include/dblayer/functions_pdo-sqlite.inc.php
+++ b/include/dblayer/functions_pdo-sqlite.inc.php
@@ -46,6 +46,7 @@ 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);
@@ -570,6 +571,11 @@ 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_sqlite.inc.php b/include/dblayer/functions_sqlite.inc.php
index 9de81868d..72f539c92 100644
--- a/include/dblayer/functions_sqlite.inc.php
+++ b/include/dblayer/functions_sqlite.inc.php
@@ -55,6 +55,7 @@ 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);
@@ -582,6 +583,11 @@ 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();