Changeset 6579

Timestamp:

Jun 22, 2010, 11:01:47 PM (14 years ago)

Author:

nikrou

Message:

Bug 1738 fixed : merge from trunk
hour function doesn't exists for database other than mysql.

Location:

branches/2.1

Files:

• admin/stats.php (modified) (1 diff)
• include/dblayer/functions_mysql.inc.php (modified) (1 diff)
• include/dblayer/functions_pdo-sqlite.inc.php (modified) (3 diffs)
• include/dblayer/functions_pgsql.inc.php (modified) (1 diff)
• include/dblayer/functions_sqlite.inc.php (modified) (3 diffs)

branches/2.1/admin/stats.php

@@ -117 +117 @@
 SELECT
     date,
-    hour(time) AS hour,
+    '.pwg_db_get_hour('time').' AS hour,
     MAX(id) AS max_id,
     COUNT(*) AS nb_pages

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

@@ -581 +581 @@
 }
 
+function pwg_db_get_hour($date) 
+{
+  return 'hour('.$date.')';
+}
+
 function pwg_db_get_date_YYYYMM($date)
 {

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);
@@ -503 +502 @@
 }
 
+function pwg_db_get_hour($date)
+{
+  return 'strftime(\'%H\', '.$date.')';
+}
+
+
 function pwg_db_get_date_YYYYMM($date)
 {
@@ -572 +577 @@
 }
 
-function pwg_hour($datetime)
-{
-  return strftime('%H', $datetime);
-}
-
 function pwg_unix_timestamp()
 {

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

@@ -545 +545 @@
 }
 
+function pwg_db_get_hour($date)
+{
+  return 'EXTRACT(HOUR FROM '.$date.')';
+}
+
 function pwg_db_get_date_YYYYMM($date)
 {

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);
@@ -515 +514 @@
 }
 
+function pwg_db_get_hour($date)
+{
+  return 'strftime(\'%H\', '.$date.')';
+}
+
 function pwg_db_get_date_YYYYMM($date)
 {
@@ -584 +588 @@
 }
 
-function pwg_hour($datetime)
-{
-  return strftime('%H', $datetime);
-}
-
 function pwg_unix_timestamp()
 {