Changeset 6667 for branches

Timestamp:

Jul 6, 2010, 2:17:37 PM (14 years ago)

Author:

nikrou

Message:

Bug 1766 fixed : [PostgreSQL] unkown database function UNIX_TIMESTAMP()
Add a new function pwg_db_date_to_ts() to calculate a timestamp from a date
Merge from trunk

Location:

branches/2.1/include

Files:

• dblayer/functions_mysql.inc.php (modified) (1 diff)
• dblayer/functions_pdo-sqlite.inc.php (modified) (1 diff)
• dblayer/functions_pgsql.inc.php (modified) (1 diff)
• dblayer/functions_sqlite.inc.php (modified) (1 diff)
• functions_session.inc.php (modified) (1 diff)

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

@@ -637 +637 @@
 }
 
+function pwg_db_date_to_ts($date) 
+{
+  return 'UNIX_TIMESTAMP('.$date.')';
+}
+
 // my_error returns (or send to standard output) the message concerning the
 // error occured for the last mysql query.

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

@@ -551 +551 @@
 }
 
+function pwg_db_date_to_ts($date) 
+{
+  return 'UNIX_TIMESTAMP('.$date.')';
+}
+
 // my_error returns (or send to standard output) the message concerning the
 // error occured for the last mysql query.

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

@@ -597 +597 @@
 }
 
+function pwg_db_date_to_ts($date) 
+{
+  return 'EXTRACT(EPOCH FROM '.$date.')';
+}
+
 // my_error returns (or send to standard output) the message concerning the
 // error occured for the last pgsql query.

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

@@ -562 +562 @@
 }
 
+function pwg_db_date_to_ts($date) 
+{
+  return 'UNIX_TIMESTAMP('.$date.')';
+}
+
 // my_error returns (or send to standard output) the message concerning the
 // error occured for the last mysql query.

branches/2.1/include/functions_session.inc.php

@@ -176 +176 @@
 DELETE
   FROM '.SESSIONS_TABLE.'
-  WHERE UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(expiration) > '
+  WHERE '.pwg_db_date_to_ts('NOW()').' - '.pwg_db_date_to_ts('expiration').' > '
   .$conf['session_length'].'
 ;';