Changeset 16734

Timestamp:

2007/11/07 17:51:51 (16 years ago)

Author:

satou

Message:

#119
SQLにdate関数を用いる必要が無い。

File:

• branches/beta/data/class/SC_SelectSql.php (modified) (1 diff)

branches/beta/data/class/SC_SelectSql.php

@@ -73 +73 @@
     //--¡¡´ü´Ö¸¡º÷¡Ê¡ûǯ¡û·î¡ûÆü¤«¢·¡ûǯ¡û·î¡ûÆü¤Þ¤Ç¡Ë
     function selectTermRange($from_year, $from_month, $from_day, $to_year, $to_month, $to_day, $column) {
-
         // FROM
-        $date1 = $from_year . "/" . $from_month . "/" . $from_day;
+        $date1 = $from_year. "/". $from_month. "/". $from_day;
         
         // TO
-        $date2 = mktime (0, 0, 0, $to_month, $to_day,  $to_year);
-        $date2 = $date2 + 86400;
-        // SQLʸ¤Îdate´Ø¿ô¤ËÍ¿¤¨¤ë¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢yyyy/mm/dd¤Ç»ØÄꤹ¤ë¡£
-        $date2 = date('Y/m/d', $date2);
+        $to_day += 1;   // °ìÆü¿Ê¤á¤ë
+        $date2 = $to_year. "/". $to_month . "/". $to_day;
         
         // ³«»Ï´ü´Ö¤À¤±»ØÄê¤Î¾ì¹ç
-        if( ( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) && ( $to_year == "" ) && ( $to_month == "" ) && ( $to_day == "" ) ) {
-            $this->setWhere( $column ." >= '" . $date1 . "'");
-        }
-
-        //¡¡³«»Ï¡Á½ªÎ»
-        if( ( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) && 
-            ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" ) ) {
-            $this->setWhere( $column ." >= '" . $date1 ."' AND ". $column . " < date('" . $date2 . "')" );
-        }
-
+        if (($from_year != "") && ($from_month != "") && ($from_day != "") && ($to_year == "") && ($to_month == "") && ($to_day == "")) {
+            $this->setWhere($column. " >= '". $date1. "'");
+        }
+        
+        // ³«»Ï¡Á½ªÎ»
+        if (($from_year != "") && ($from_month != "") && ($from_day != "") && ($to_year != "") && ($to_month != "") && ($to_day != "")) {
+            $this->setWhere($column ." >= '" . $date1 ."' AND ". $column . " < '" . $date2 . "'");
+        }
+        
         // ½ªÎ»´ü´Ö¤À¤±»ØÄê¤Î¾ì¹ç
-        if( ( $from_year == "" ) && ( $from_month == "" ) && ( $from_day == "" ) && ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" ) ) {
-            $this->setWhere( $column ." < date('" . $date2 . "')");
+        if(($from_year == "") && ($from_month == "") && ($from_day == "") && ($to_year != "") && ($to_month != "") && ($to_day != "")) {
+            $this->setWhere($column ." < '" . $date2 . "'");
         }
         return $return;