Changeset 385

Show
Ignore:
Timestamp:
31.05.2006 22:22:19 (4 years ago)
Author:
hans
Message:

ticket:275 (cont.) - Renamed Criteria2 -> Criteria

Location:
trunk
Files:
3 modified
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php

    r384 r385  
    316316        public static function createCriteria(\$alias = null) 
    317317        { 
    318                 return new Criteria2(".$this->getPeerClassname()."::createQueryTable(\$alias)); 
     318                return new Criteria(".$this->getPeerClassname()."::createQueryTable(\$alias)); 
    319319        } 
    320320"; 

  • trunk/runtime/classes/propel/util/BasePeer.php

    r384 r385  
    107107         * @throws PropelException 
    108108         */ 
    109         public static function doDelete(Criteria2 $criteria, PDO $con) 
     109        public static function doDelete(Criteria $criteria, PDO $con) 
    110110        { 
    111111                $dbname = $criteria->getDbName(); 
    … …  
    279279         * @throws PropelException 
    280280         */ 
    281         public static function doUpdate(Criteria2 $selectCriteria, ColumnValueCollection $updateValues, PDO $con) 
     281        public static function doUpdate(Criteria $selectCriteria, ColumnValueCollection $updateValues, PDO $con) 
    282282        { 
    283283                $tableMap = $updateValues->getTableMap(); 

  • trunk/runtime/classes/propel/util/Criteria.php

    r384 r385  
    3939 * @package propel.util 
    4040 */ 
    41 class Criteria2 extends BaseExpressionContainer implements ExpressionContainer { 
     41class Criteria extends BaseExpressionContainer implements ExpressionContainer { 
    4242 
    4343    /** 

  • trunk/runtime/classes/propel/util/Query.php

    r384 r385  
    2020 */ 
    2121 
    22 require_once 'propel/util/Criteria2.php'; 
     22require_once 'propel/util/Criteria.php'; 
    2323 
    2424/** 
    … …  
    5151     * @param Crieria The primary Criteria for this query. 
    5252     */ 
    53     public function __construct(Criteria2 $c) 
     53    public function __construct(Criteria $c) 
    5454    { 
    5555        $this->setCriteria($c);