Ignore:
Timestamp:
2010/08/20 18:06:32 (12 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100819104758-beubop5hq0pwdqhx
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/SC_CustomerList.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CustomerList.php
data/class/batch/SC_Batch_Daily.php 15600@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fbatch%2FSC_Batch_Daily.php
data/class/db/SC_DB_DBFactory.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2FSC_DB_DBFactory.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/pages/admin/LC_Page_Admin_Home.php 15287@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2FLC_Page_Admin_Home.php
data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php 16321@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail_Sendmail.php
data/class/pages/admin/order/LC_Page_Admin_Order.php 15584@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order.php
data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 17293@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_ProductSelect.php
data/class/pages/admin/products/LC_Page_Admin_Products.php 15342@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php 15557@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductSelect.php
data/class/pages/mypage/LC_Page_Mypage_DownLoad.php 18777@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_DownLoad.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
test/class/db/SC_DB_DBFactory_Test.php 15242@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Ftest%2Fclass%2Fdb%2FSC_DB_DBFactory_Test.php
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100820090626-dkyj2ngdh7vklaow
bzr:revno:
2272
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-parents:

data/class/SC_CustomerList.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/batch/SC_Batch_Daily.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/db/SC_DB_DBFactory.php ohkouchi@loop-az.jp-20100804045224-nsulc26bh1ttqfrb
data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php ohkouchi@loop-az.jp-20100812103342-5fc7rp06997dbg6e
data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php ohkouchi@loop-az.jp-20100812103342-5fc7rp06997dbg6e
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20100812103342-5fc7rp06997dbg6e
data/class/pages/admin/LC_Page_Admin_Home.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php ohkouchi@loop-az.jp-20100803050621-j3gswdse0qsqamvw
data/class/pages/admin/order/LC_Page_Admin_Order.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/products/LC_Page_Admin_Products.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/mypage/LC_Page_Mypage_DownLoad.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18777
data/class/util/SC_Utils.php ohkouchi@loop-az.jp-20100804045224-nsulc26bh1ttqfrb
test/class/db/SC_DB_DBFactory_Test.php ohkouchi@loop-az.jp-20100726081655-tqxqwy02bxqhswcu
bzr:timestamp:
2010-08-20 18:06:26.950999975 +0900
bzr:user-agent:
bzr2.1.2+bzr-svn1.0.2
svn:original-date:
2010-08-20T09:06:26.951000Z
Message:

DB_TYPE で条件分岐している箇所の抽象化(#801)

  • DB_TYPE で条件分岐している箇所の修正
  • SC_DB_DBFactory に関数を追加
    • getOrderYesterdaySql()
    • getOrderMonthSql()
    • getReviewYesterdaySql()
    • getSendHistoryWhereStartdateSql()
    • concatColumn()
  • SC_Utils::sfManualEscape() の実装を SC_Query::quote() に変更
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/SC_CustomerList.php

    r18701 r18789  
    3131    function SC_CustomerList($array, $mode = '') { 
    3232        parent::SC_SelectSql($array); 
    33          
     33 
    3434        $masterData = new SC_DB_MasterData_Ex(); 
    3535        $arrMobileDomain = $masterData->getMasterData("mtb_mobile_domain"); 
    36          
     36 
    3737        $objDb = new SC_Helper_DB_Ex(); 
     38        $dbFactory = SC_DB_DBFactory::getInstance(); 
    3839 
    3940        if($mode == "") { 
     
    7071        if (!isset($this->arrSql['name'])) $this->arrSql['name'] = ""; 
    7172        if ( strlen($this->arrSql['name']) > 0 ) { 
    72             if(DB_TYPE == "pgsql"){ 
    73                 $this->setWhere("(name01 || name02 LIKE ?)" ); 
    74             }elseif(DB_TYPE == "mysql"){ 
    75                 $this->setWhere("concat(name01,name02) LIKE ?" ); 
    76             } 
    77  
     73            $this->setWhere("(" . $dbFactory->concatColumn(array("name01", "name02")) . " LIKE ?)" ); 
    7874            $searchName = $this->addSearchStr($this->arrSql['name']); 
    7975            $this->arrVal[] = mb_ereg_replace("[  ]+","",$searchName); 
     
    8379        if (!isset($this->arrSql['kana'])) $this->arrSql['kana'] = ""; 
    8480        if ( strlen($this->arrSql['kana']) > 0 ) { 
    85             if(DB_TYPE == "pgsql"){ 
    86                 $this->setWhere("(kana01 || kana02 LIKE ?)"); 
    87             }elseif(DB_TYPE == "mysql"){ 
    88                 $this->setWhere("concat(kana01,kana02) LIKE ?" ); 
    89             } 
     81            $this->setWhere("(" . $dbFactory->concatColumn(array("kana01", "kana02")) . " LIKE ?)" ); 
    9082            $searchKana = $this->addSearchStr($this->arrSql['kana']); 
    9183            $this->arrVal[] = mb_ereg_replace("[  ]+","",$searchKana); 
     
    10294        if (!isset($this->arrSql['tel'])) $this->arrSql['tel'] = ""; 
    10395        if ( is_numeric( $this->arrSql['tel'] ) ) { 
    104             if(DB_TYPE == "pgsql"){ 
    105                 $this->setWhere( "(tel01 || tel02 || tel03 LIKE ?)" ); 
    106             }elseif(DB_TYPE == "mysql"){ 
    107                 $this->setWhere("concat(tel01,tel02,tel03) LIKE ?" ); 
    108             } 
     96            $this->setWhere("(" . $dbFactory->concatColumn(array("tel01", "tel02", "tel03")) . " LIKE ?)" ); 
    10997            $searchTel = $this->addSearchStr($this->arrSql['tel']); 
    11098            $this->arrVal[] = ereg_replace("-", "", $searchTel); 
Note: See TracChangeset for help on using the changeset viewer.