Changeset 21185 for branches/version-2_11-dev/data/class/db

Timestamp:

2011/08/11 19:37:10 (13 years ago)

Author:

shutta

Message:

refs #800 (SQL標準関数を使用する)
CURRENT_TIMESTAMP を使用するように now() を置換。

Location:

branches/version-2_11-dev/data/class/db/dbfactory

Files:

• SC_DB_DBFactory_MYSQL.php (modified) (3 diffs)
• SC_DB_DBFactory_PGSQL.php (modified) (4 diffs)

branches/version-2_11-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

@@ -108 +108 @@
               . "WHERE del_flg = 0 "
                 . "AND date_format(create_date, '%Y/%m') = ? "
-                . "AND date_format(create_date, '%Y/%m/%d') <> date_format(now(), '%Y/%m/%d') "
+                . "AND date_format(create_date, '%Y/%m/%d') <> date_format(CURRENT_TIMESTAMP, '%Y/%m/%d') "
                 . "AND status <> " . ORDER_CANCEL;
     }
@@ -133 +133 @@
      */
     function getSendHistoryWhereStartdateSql() {
-        return "start_date BETWEEN date_add(now(),INTERVAL -5 minute) AND date_add(now(),INTERVAL 5 minute)";
+        return "start_date BETWEEN date_add(CURRENT_TIMESTAMP,INTERVAL -5 minute) AND date_add(CURRENT_TIMESTAMP,INTERVAL 5 minute)";
     }
 
@@ -143 +143 @@
      */
     function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order') {
-        return "(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(NOW()) <= DATE(DATE_ADD(" . $dtb_order_alias . ".payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))";
+        return "(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(CURRENT_TIMESTAMP) <= DATE(DATE_ADD(" . $dtb_order_alias . ".payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))";
     }
 

branches/version-2_11-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php

@@ -73 +73 @@
         return "SELECT ".$method."(total) FROM dtb_order "
               . "WHERE del_flg = 0 "
-                . "AND to_char(create_date,'YYYY/MM/DD') = to_char(now() - interval '1 days','YYYY/MM/DD') "
+                . "AND to_char(create_date,'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') "
                 . "AND status <> " . ORDER_CANCEL;
     }
@@ -87 +87 @@
               . "WHERE del_flg = 0 "
                 . "AND to_char(create_date,'YYYY/MM') = ? "
-                . "AND to_char(create_date,'YYYY/MM/DD') <> to_char(now(),'YYYY/MM/DD') "
+                . "AND to_char(create_date,'YYYY/MM/DD') <> to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD') "
                 . "AND status <> " . ORDER_CANCEL;
     }
@@ -102 +102 @@
               . "WHERE A.del_flg=0 "
                 . "AND B.del_flg = 0 "
-                . "AND to_char(A.create_date, 'YYYY/MM/DD') = to_char(now() - interval '1 days','YYYY/MM/DD') "
-                . "AND to_char(A.create_date,'YYYY/MM/DD') != to_char(now(),'YYYY/MM/DD')";
+                . "AND to_char(A.create_date, 'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') "
+                . "AND to_char(A.create_date,'YYYY/MM/DD') != to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD')";
     }
 
@@ -126 +126 @@
         $downloadable_days = $baseinfo['downloadable_days'];
         if($downloadable_days ==null || $downloadable_days == "")$downloadable_days=0;
-        return "(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND " . $dtb_order_alias . ".payment_date IS NOT NULL THEN 1 WHEN DATE(NOW()) <= DATE(" . $dtb_order_alias . ".payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)";
+        return "(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND " . $dtb_order_alias . ".payment_date IS NOT NULL THEN 1 WHEN DATE(CURRENT_TIMESTAMP) <= DATE(" . $dtb_order_alias . ".payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)";
     }