Changeset 6464

Timestamp:

06/04/10 21:39:02 (3 years ago)

Author:

nikrou

Message:

Bug 1717 fixed : SQLite: access failure on Admin > Tools > History
hour function doesn't exists
Merge from trunk.

Location:

branches/2.1

Files:

• admin/stats.php (modified) (2 diffs)
• include/dblayer/functions_pdo-sqlite.inc.php (modified) (2 diffs)
• include/dblayer/functions_sqlite.inc.php (modified) (2 diffs)

branches/2.1/admin/stats.php

@@ -117 +117 @@
 SELECT
     date,
-    HOUR(time) AS hour,
+    hour(time) AS hour,
     MAX(id) AS max_id,
     COUNT(*) AS nb_pages
@@ -123 +123 @@
   WHERE summarized = \'false\'
   GROUP BY
+    date,
+    hour
+  ORDER BY
     date ASC,
-    HOUR(time) ASC
+    hour ASC
 ;';
 $result = pwg_query($query);

branches/2.1/include/dblayer/functions_pdo-sqlite.inc.php

@@ -47 +47 @@
 
   $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);
@@ -571 +572 @@
 }
 
+function pwg_hour($datetime)
+{
+  return strftime('%H', $datetime);
+}
+
 function pwg_unix_timestamp()
 {

branches/2.1/include/dblayer/functions_sqlite.inc.php

@@ -56 +56 @@
 
   $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);
@@ -583 +584 @@
 }
 
+function pwg_hour($datetime)
+{
+  return strftime('%H', $datetime);
+}
+
 function pwg_unix_timestamp()
 {