[Svn-src-all:4302] [version-2_13_0 23216] #2111 MySQLでの取得条件を修正しました。

[m_uehara]

Subversion committed to /home/svn/open 23216
http://svn.ec-cube.net/open_trac/changeset/23216
┌────────────────────────────┐
│更新者　:  m_uehara                                     │
│更新日時:  2013-09-11 15:58:19 +0900 (水, 11  9月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2111 MySQLでの取得条件を修正しました。

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_13_0/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

変更: branches/version-2_13_0/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
===================================================================
--- branches/version-2_13_0/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	2013-09-11 05:39:25 UTC (rev 23215)
+++ branches/version-2_13_0/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	2013-09-11 06:58:19 UTC (rev 23216)
@@ -150,7 +150,18 @@
      */
     public function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order')
     {
-        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))))';
+        $sql = <<< __EOS__
+        (
+            SELECT
+                IF (
+                    (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND $dtb_order_alias.payment_date IS NOT NULL,
+                    1,
+                    IF( DATE(CURRENT_TIMESTAMP) <= DATE(DATE_ADD($dtb_order_alias.payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY)), 1, 0)
+                )
+        )
+__EOS__;
+        
+        return $sql;
     }
 
     /**