Changeset 1615

Show
Ignore:
Timestamp:
06/02/08 17:18:57 (4 months ago)
Author:
mikey
Message:

take default entity order into account
todo: allow overruling of default order via additional param on findByCriterion() and findAll()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/rdbms/persistence/finder/stubDatabaseFinder.php

    r1611 r1615  
    159159        } 
    160160         
     161        $entityAnnotation = $entityClass->getAnnotation('Entity'); 
     162        if ($entityAnnotation->hasDefaultOrder() === true) { 
     163            $select->orderBy($entityAnnotation->getDefaultOrder()); 
     164        } 
     165         
    161166        try { 
    162167            $result = $this->connection->query(stubDatabaseQueryBuilderFactory::create($this->connection)->createSelect($select)); 

  • trunk/src/test/php/net/stubbles/rdbms/persistence/MockSinglePrimaryKeyEntity.php

    r951 r1615  
    1111 * @package     stubbles 
    1212 * @subpackage  rdbms_persistence_test 
    13  * @Entity 
     13 * @Entity(defaultOrder='bar ASC') 
    1414 * @DBTable(name='foo') 
    1515 */ 

  • trunk/src/test/php/net/stubbles/rdbms/persistence/finder/stubDatabaseFinderTestCase.php

    r1611 r1615  
    192192        $select = $this->mockQueryBuilder->getSelect(); 
    193193        $this->assertEquals('foo', $select->getBaseTableName()); 
     194        $this->assertEquals('bar ASC', $select->getOrderedBy()); 
    194195        $this->assertTrue($select->hasCriterion()); 
    195196    } 
    …… 
    216217        $select = $this->mockQueryBuilder->getSelect(); 
    217218        $this->assertEquals('foo', $select->getBaseTableName()); 
     219        $this->assertEquals('bar ASC', $select->getOrderedBy()); 
    218220        $this->assertFalse($select->hasCriterion()); 
    219221    }