Changeset 20167 for branches/version-2_5-dev/data/class/db

Timestamp:

2011/02/15 16:43:52 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20166

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2Fdbfactory%2FSC_DB_DBFactory_MYSQL.php
data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2Fdbfactory%2FSC_DB_DBFactory_PGSQL.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/mypage/LC_Page_Mypage_History.php 16102@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_History.php
data/plugin/bingo/SC_Plugin_bingo.php 19521@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2Fplugin%2Fbingo%2FSC_Plugin_bingo.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2895

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_Query.php [email protected]
data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php [email protected]
data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php [email protected]
data/class/helper/SC_Helper_DB.php [email protected]
data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_History.php [email protected]
data/plugin/bingo/SC_Plugin_bingo.php [email protected]

bzr:timestamp:

2011-02-15 16:43:39.124000072 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-15T07:43:39.124000Z

Message:

#981([フロント]MYページ)

• 受注取得処理を抽象化

#642(共通ロジックの機能向上)

• SC_Query::extractOnlyColsOf() を追加

#628(未使用処理・定義などの削除)

• SC_Helper_DB クラスの未使用関数を削除

Location:

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

Files:

• SC_DB_DBFactory_MYSQL.php (modified) (1 diff)
• SC_DB_DBFactory_PGSQL.php (modified) (1 diff)

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

@@ -144 +144 @@
      * @return string 検索条件の SQL
      */
-    function getDownloadableDaysWhereSql() {
-        return "(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(NOW()) <= DATE(DATE_ADD(o.payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))";
+    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))))";
     }
 

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

@@ -122 +122 @@
      * @return string 検索条件の SQL
      */
-    function getDownloadableDaysWhereSql() {
+    function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order') {
         $baseinfo = SC_Helper_DB_Ex::sfGetBasisData();
         //downloadable_daysにNULLが入っている場合(無期限ダウンロード可能時)もあるので、NULLの場合は0日に補正
         $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 o.payment_date IS NOT NULL THEN 1 WHEN DATE(NOW()) <= DATE(o.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(NOW()) <= DATE(" . $dtb_order_alias . ".payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)";
     }