Changeset 21527 for branches/version-2_12-dev/data/class/db

Timestamp:

2012/02/17 02:42:21 (12 years ago)

Author:

Seasoft

Message:

#1613 (ソース整形・ソースコメントの改善)

• Zend Framework PHP 標準コーディング規約への準拠を高めた

Location:

branches/version-2_12-dev/data/class/db

Files:

• SC_DB_MasterData.php (modified) (2 diffs)
• dbfactory/SC_DB_DBFactory_MYSQL.php (modified) (3 diffs)
• dbfactory/SC_DB_DBFactory_PGSQL.php (modified) (3 diffs)

branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php

@@ -249 +249 @@
      * @param bool $isDefine 定数を生成する場合 true
      * @param array $commentColumn [0] => キー, [1] => コメント文字列,
-                                   [2] => 表示順 を表すカラム名を格納した配列
+     *                             [2] => 表示順 を表すカラム名を格納した配列
      * @return bool キャッシュの生成に成功した場合 true
      */
-    function createCache($name, $columns = array(), $isDefine = false,
-                         $commentColumn = array()) {
+    function createCache($name, $columns = array(), $isDefine = false, $commentColumn = array()) {
 
         // マスターデータを取得
@@ -266 +265 @@
             // 定数コメントを生成する場合
             if (!empty($commentColumn)) {
-                $data .= $this->getMasterDataAsDefine($masterData,
-                                 $this->getDbMasterData($name, $commentColumn));
+                $data .= $this->getMasterDataAsDefine($masterData, $this->getDbMasterData($name, $commentColumn));
             } else {
                 $data .= $this->getMasterDataAsDefine($masterData);

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

@@ -89 +89 @@
      */
     function getOrderYesterdaySql($method) {
-        return 'SELECT '.$method.'(total) FROM dtb_order '
-              . 'WHERE del_flg = 0 '
-                . 'AND cast(create_date as date) = DATE_ADD(current_date, interval -1 day) '
-                . 'AND status <> ' . ORDER_CANCEL;
+        return 'SELECT ' . $method . '(total) FROM dtb_order '
+               . 'WHERE del_flg = 0 '
+               . 'AND cast(create_date as date) = DATE_ADD(current_date, interval -1 day) '
+               . 'AND status <> ' . ORDER_CANCEL;
     }
 
@@ -103 +103 @@
     function getOrderMonthSql($method) {
         return 'SELECT '.$method.'(total) FROM dtb_order '
-              . 'WHERE del_flg = 0 '
-                . "AND date_format(create_date, '%Y/%m') = ? "
-                . "AND date_format(create_date, '%Y/%m/%d') <> date_format(CURRENT_TIMESTAMP, '%Y/%m/%d') "
-                . 'AND status <> ' . ORDER_CANCEL;
+               . 'WHERE del_flg = 0 '
+               . "AND date_format(create_date, '%Y/%m') = ? "
+               . "AND date_format(create_date, '%Y/%m/%d') <> date_format(CURRENT_TIMESTAMP, '%Y/%m/%d') "
+               . 'AND status <> ' . ORDER_CANCEL;
     }
 
@@ -116 +116 @@
     function getReviewYesterdaySql() {
         return 'SELECT COUNT(*) FROM dtb_review AS A '
-          . 'LEFT JOIN dtb_products AS B '
-                 . 'ON A.product_id = B.product_id '
-              . 'WHERE A.del_flg = 0 '
-                . 'AND B.del_flg = 0 '
-                . 'AND cast(A.create_date as date) = DATE_ADD(current_date, interval -1 day) '
-                . 'AND cast(A.create_date as date) != current_date';
+               . 'LEFT JOIN dtb_products AS B '
+               . 'ON A.product_id = B.product_id '
+               . 'WHERE A.del_flg = 0 '
+               . 'AND B.del_flg = 0 '
+               . 'AND cast(A.create_date as date) = DATE_ADD(current_date, interval -1 day) '
+               . 'AND cast(A.create_date as date) != current_date';
     }
 

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

@@ -69 +69 @@
     function getOrderYesterdaySql($method) {
         return 'SELECT '.$method.'(total) FROM dtb_order '
-              . 'WHERE del_flg = 0 '
-                . "AND to_char(create_date,'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') "
-                . 'AND status <> ' . ORDER_CANCEL;
+               . 'WHERE del_flg = 0 '
+               . "AND to_char(create_date,'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') "
+               . 'AND status <> ' . ORDER_CANCEL;
     }
 
@@ -82 +82 @@
     function getOrderMonthSql($method) {
         return 'SELECT '.$method.'(total) FROM dtb_order '
-              . 'WHERE del_flg = 0 '
-                . "AND to_char(create_date,'YYYY/MM') = ? "
-                . "AND to_char(create_date,'YYYY/MM/DD') <> to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD') "
-                . 'AND status <> ' . ORDER_CANCEL;
+               . 'WHERE del_flg = 0 '
+               . "AND to_char(create_date,'YYYY/MM') = ? "
+               . "AND to_char(create_date,'YYYY/MM/DD') <> to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD') "
+               . 'AND status <> ' . ORDER_CANCEL;
     }
 
@@ -95 +95 @@
     function getReviewYesterdaySql() {
         return 'SELECT COUNT(*) FROM dtb_review AS A '
-          . 'LEFT JOIN dtb_products AS B '
-                 . 'ON A.product_id = B.product_id '
-              . 'WHERE A.del_flg=0 '
-                . 'AND B.del_flg = 0 '
-                . "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')";
+               . 'LEFT JOIN dtb_products AS B '
+               . 'ON A.product_id = B.product_id '
+               . 'WHERE A.del_flg=0 '
+               . 'AND B.del_flg = 0 '
+               . "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')";
     }