Changeset 21186 for branches

Timestamp:

2011/08/11 19:38:25 (13 years ago)

Author:

shutta

Message:

refs #800 (SQL標準関数を使用する)
CURRENT_TIMESTAMP を使用するように now() を置換。
r21185 のコミット漏れ。

Location:

branches/version-2_11-dev/test

Files:

• class/db/SC_DB_DBFactory_Test.php (modified) (4 diffs)
• class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php (modified) (1 diff)
• createEcCubeData-v25.php (modified) (5 diffs)

branches/version-2_11-dev/test/class/db/SC_DB_DBFactory_Test.php

@@ -93 +93 @@
             $expected = "SELECT COUNT(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;
             break;
@@ -122 +122 @@
                         . "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;
             break;
@@ -130 +130 @@
                        . "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;
             break;
@@ -154 +154 @@
                        . "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')";
             break;
 

branches/version-2_11-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php

@@ -112 +112 @@
                                                    'customer_id' => (int) 0,
                                                    'payment_id' => $payment_id,
-                                                   'create_date' => 'now()',
-                                                   'update_date' => 'now()'));
+                                                   'create_date' => 'CURRENT_TIMESTAMP',
+                                                   'update_date' => 'CURRENT_TIMESTAMP'));
 
         $this->objQuery->insert("dtb_payment", array('payment_id' => $order_id,
                                                      'module_path' => $module_path,
                                                      'creator_id' => 1,
-                                                     'create_date' => 'now()',
-                                                     'update_date' => 'now()'));
+                                                     'create_date' => 'CURRENT_TIMESTAMP',
+                                                     'update_date' => 'CURRENT_TIMESTAMP'));
     }
 }

branches/version-2_11-dev/test/createEcCubeData-v25.php

@@ -136 +136 @@
         // 全カテゴリ共通の値
         $sqlval['creator_id'] = 2;
-        $sqlval['create_date'] = "now()";
-        $sqlval['update_date'] = "now()";
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $sqlval['del_flg'] = (string) "0";
 
@@ -253 +253 @@
             $sqlval['del_flg'] = (string) "0";
             $sqlval['creator_id'] = 2;
-            $sqlval['create_date'] = "now()";
-            $sqlval['update_date'] = "now()";
+            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+            $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
             $sqlval['deliv_date_id'] = 2;
             $this->objQuery->insert("dtb_products", $sqlval);
@@ -281 +281 @@
                               WHERE del_flg = 0) as x),";
         $sqlval['creator_id'] = 2;
-        $sqlval['create_date'] = "now()";
-        $sqlval['update_date'] = "now()";
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $sqlval['del_flg'] = (string) "0";
         $this->objQuery->insert("dtb_class", $sqlval);
@@ -308 +308 @@
                                         AND class_id = %d) as x),", $class_id);
         $sqlval['creator_id'] = 2;
-        $sqlval['create_date'] = "now()";
-        $sqlval['update_date'] = "now()";
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $sqlval['del_flg'] = (string) "0";
 
@@ -345 +345 @@
         $sqlval['point_rate'] = 10;
         $sqlval['creator_id'] = 2;
-        $sqlval['create_date'] = "now()";
-        $sqlval['update_date'] = "now()";
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $sqlval['del_flg'] = 0;