Changeset 18758 for trunk/data/class/db


Ignore:
Timestamp:
2010/07/20 13:25:33 (16 years ago)
Author:
kajiwara
Message:

EC-CUBE Ver2.4.4 分コミット。詳細はこちら（ http://www.ec-cube.net/release/detail.php?release_id=223）

Location:
trunk/data/class/db
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/class/db/SC_DB_DBFactory.php

    r16741 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 

  • trunk/data/class/db/SC_DB_MasterData.php

    r18562 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 
    … …  
    305305 
    306306        $this->objQuery = new SC_Query(); 
    307         $this->objQuery->setorder($columns[2]); 
     307        $this->objQuery->setOrder($columns[2]); 
    308308        $results = $this->objQuery->select($columns[0] . ", " . $columns[1], $name); 
    309309 

  • trunk/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

    r18432 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 
    … …  
    243243     */ 
    244244    function sfChangeTrunc($sql){ 
    245         $changesql = eregi_replace("( TRUNC)", " TRUNCATE", $sql); 
    246         return $changesql; 
     245        if (preg_match('/TRUNCATE/i', $sql)) { 
     246            return $sql; 
     247        } 
     248        return eregi_replace("( TRUNC)", " TRUNCATE", $sql); 
    247249    } 
    248250 

  • trunk/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php

    r16938 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 
Note: See TracChangeset for help on using the changeset viewer.