Changeset 4957

Show
Ignore:
Timestamp:
09/12/08 21:00:11 (4 months ago)
Author:
jwage
Message:

fixes #1450

Location:
branches/1.0
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • branches/1.0/lib/Doctrine/Collection.php

    r4889 r4957  
    666666 
    667667    /** 
    668      * Mimics the result of a $query->execute(array(), Doctrine::FETCH_ARRAY); 
     668     * Mimics the result of a $query->execute(array(), Doctrine::HYDRATE_ARRAY); 
    669669     * 
    670670     * @param boolean $deep 

  • branches/1.0/lib/Doctrine/Connection.php

    r4827 r4957  
    885885     * @param string $query             DQL query 
    886886     * @param array $params             query parameters 
    887      * @param int $hydrationMode        Doctrine::FETCH_ARRAY or Doctrine::FETCH_RECORD 
     887     * @param int $hydrationMode        Doctrine::HYDRATE_ARRAY or Doctrine::HYDRATE_RECORD 
    888888     * @see Doctrine_Query 
    889889     * @return Doctrine_Collection      Collection of Doctrine_Record objects 

  • branches/1.0/lib/Doctrine/Query.php

    r4848 r4957  
    19001900     * @param string $query      DQL query 
    19011901     * @param array $params      prepared statement parameters 
    1902      * @param int $hydrationMode Doctrine::FETCH_ARRAY or Doctrine::FETCH_RECORD 
     1902     * @param int $hydrationMode Doctrine::HYDRATE_ARRAY or Doctrine::HYDRATE_RECORD 
    19031903     * @see Doctrine::FETCH_* constants 
    19041904     * @return mixed 

  • branches/1.0/lib/Doctrine/Record.php

    r4884 r4957  
    792792            $record = $query->fetchOne($id); 
    793793        } else { 
    794             // Use FETCH_ARRAY to avoid clearing object relations 
     794            // Use HYDRATE_ARRAY to avoid clearing object relations 
    795795            $record = $this->getTable()->find($id, Doctrine::HYDRATE_ARRAY); 
    796796            if ($record) { 

  • branches/1.0/lib/Doctrine/Record/Abstract.php

    r4838 r4957  
    281281 
    282282        if ( ! ($tpl instanceof Doctrine_Template)) { 
    283             throw new Doctrine_Record_Exception('Loaded behavior class is not an istance of Doctrine_Template.'); 
     283            throw new Doctrine_Record_Exception('Loaded behavior class is not an instance of Doctrine_Template.'); 
    284284        } 
    285285 

  • branches/1.0/lib/Doctrine/Table.php

    r4894 r4957  
    12741274     * returns a collection of records 
    12751275     * 
    1276      * @param int $hydrationMode        Doctrine::FETCH_ARRAY or Doctrine::FETCH_RECORD 
     1276     * @param int $hydrationMode        Doctrine::HYDRATE_ARRAY or Doctrine::HYDRATE_RECORD 
    12771277     * @return Doctrine_Collection 
    12781278     */ 
    … …  
    12901290     * @param string $dql               DQL after WHERE clause 
    12911291     * @param array $params             query parameters 
    1292      * @param int $hydrationMode        Doctrine::FETCH_ARRAY or Doctrine::FETCH_RECORD 
     1292     * @param int $hydrationMode        Doctrine::HYDRATE_ARRAY or Doctrine::HYDRATE_RECORD 
    12931293     * @return Doctrine_Collection 
    12941294     * 
    … …  
    13091309     * @param string $dql               DQL after WHERE clause 
    13101310     * @param array $params             query parameters 
    1311      * @param int $hydrationMode        Doctrine::FETCH_ARRAY or Doctrine::FETCH_RECORD 
     1311     * @param int $hydrationMode        Doctrine::HYDRATE_ARRAY or Doctrine::HYDRATE_RECORD 
    13121312     * @return Doctrine_Collection 
    13131313     */ 

  • branches/1.0/tests/RawSqlTestCase.php

    r4681 r4957  
    234234        $query->addComponent('phonenumber', 'Entity.Phonenumber'); 
    235235        $this->assertEqual($query->getSql(), 'SELECT entity.name AS entity__name, entity.id AS entity__id, phonenumber.id AS phonenumber__id, phonenumber.phonenumber AS phonenumber__phonenumber, phonenumber.entity_id AS phonenumber__entity_id FROM entity LEFT JOIN phonenumber ON phonenumber.entity_id = entity.id LIMIT 3'); 
    236         $coll = $query->execute(array(), Doctrine::FETCH_ARRAY); 
     236        $coll = $query->execute(array(), Doctrine::HYDRATE_ARRAY); 
    237237 
    238238        $this->assertEqual(count($coll), 3); 
    … …  
    247247        $query->addComponent('phonenumber', 'Entity.Phonenumber'); 
    248248        $this->assertEqual($query->getSql(), 'SELECT entity.name AS entity__name, entity.id AS entity__id, phonenumber.id AS phonenumber__id, phonenumber.phonenumber AS phonenumber__phonenumber, phonenumber.entity_id AS phonenumber__entity_id FROM entity LEFT JOIN phonenumber ON phonenumber.entity_id = entity.id LIMIT 3'); 
    249         $coll = $query->execute(array(), Doctrine::FETCH_ARRAY); 
     249        $coll = $query->execute(array(), Doctrine::HYDRATE_ARRAY); 
    250250 
    251251        $this->assertEqual(count($coll), 3); 

  • branches/1.0/tests/Relation/CircularSavingTestCase.php

    r3884 r4957  
    102102 
    103103        $q = new Doctrine_Query(); 
    104         $coll = $q->from('NestReference')->execute(array(), Doctrine::FETCH_ARRAY); 
     104        $coll = $q->from('NestReference')->execute(array(), Doctrine::HYDRATE_ARRAY); 
    105105 
    106106        $this->assertEqual(count($coll), 1);