Show
Ignore:
Timestamp:
02/16/08 19:10:16 (11 months ago)
Author:
romanb
Message:

small refactorings

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/tests_old/Metadata/FactoryTestCase.php

    r3701 r3811  
    2323    public function testMetadataSetupOnClassTableInheritanceHierarchy() 
    2424    {         
    25         $userClass = $this->conn->getMetadata('Metadata_User'); 
     25        $userClass = $this->conn->getClassMetadata('Metadata_User'); 
    2626        $this->assertTrue($userClass instanceof Doctrine_ClassMetadata); 
    2727        $this->assertEqual('cti_user', $userClass->getTableName()); 
     
    157157        ); 
    158158        $class->setSubclasses(array('Metadata_Manager', 'Metadata_Customer', 'Metadata_SuperManager')); 
    159         $class->mapField('cti_id as id', 'integer', 4, array('primary' => true, 'autoincrement' => true)); 
    160         $class->mapField('cti_foo as foo', 'integer', 4); 
    161         $class->mapField('cti_name as name', 'string', 50); 
    162         $class->mapField('type', 'integer', 1); 
     159        $class->mapColumn('cti_id as id', 'integer', 4, array('primary' => true, 'autoincrement' => true)); 
     160        $class->mapColumn('cti_foo as foo', 'integer', 4); 
     161        $class->mapColumn('cti_name as name', 'string', 50); 
     162        $class->mapColumn('type', 'integer', 1); 
    163163         
    164164        //$class->setNamedQuery('findByName', 'SELECT u.* FROM User u WHERE u.name = ?'); 
     
    172172        $class->setTableName('cti_manager'); 
    173173        $class->setSubclasses(array('Metadata_SuperManager')); 
    174         $class->mapField('ctim_salary as salary', 'varchar', 50, array()); 
     174        $class->mapColumn('ctim_salary as salary', 'varchar', 50, array()); 
    175175    } 
    176176} 
     
    181181    { 
    182182        $class->setTableName('cti_customer'); 
    183         $class->setColumn('ctic_bonuspoints as bonuspoints', 'varchar', 50, array()); 
     183        $class->mapColumn('ctic_bonuspoints as bonuspoints', 'varchar', 50, array()); 
    184184    } 
    185185} 
     
    190190    { 
    191191        $class->setTableName('cti_supermanager'); 
    192         $class->mapField('ctism_gosutitle as gosutitle', 'varchar', 50, array()); 
     192        $class->mapColumn('ctism_gosutitle as gosutitle', 'varchar', 50, array()); 
    193193    } 
    194194} 
     
    211211        ); 
    212212        $class->setSubclasses(array('Metadata_STI_Manager', 'Metadata_STI_Customer', 'Metadata_STI_SuperManager')); 
    213         $class->mapField('cti_id as id', 'integer', 4, array('primary' => true, 'autoincrement' => true)); 
    214         $class->mapField('cti_foo as foo', 'integer', 4); 
    215         $class->mapField('cti_name as name', 'string', 50); 
    216         $class->mapField('type', 'integer', 1); 
     213        $class->mapColumn('cti_id as id', 'integer', 4, array('primary' => true, 'autoincrement' => true)); 
     214        $class->mapColumn('cti_foo as foo', 'integer', 4); 
     215        $class->mapColumn('cti_name as name', 'string', 50); 
     216        $class->mapColumn('type', 'integer', 1); 
    217217         
    218218        //$class->setNamedQuery('findByName', 'SELECT u.* FROM User u WHERE u.name = ?'); 
     
    226226        $class->setTableName('cti_manager'); 
    227227        $class->setSubclasses(array('Metadata_STI_SuperManager')); 
    228         $class->mapField('ctim_salary as salary', 'varchar', 50, array()); 
     228        $class->mapColumn('ctim_salary as salary', 'varchar', 50, array()); 
    229229    } 
    230230} 
     
    235235    { 
    236236        $class->setTableName('cti_customer'); 
    237         $class->setColumn('ctic_bonuspoints as bonuspoints', 'varchar', 50, array()); 
     237        $class->mapColumn('ctic_bonuspoints as bonuspoints', 'varchar', 50, array()); 
    238238    } 
    239239} 
     
    244244    { 
    245245        $class->setTableName('cti_supermanager'); 
    246         $class->mapField('ctism_gosutitle as gosutitle', 'varchar', 50, array()); 
    247     } 
    248 } 
    249  
     246        $class->mapColumn('ctism_gosutitle as gosutitle', 'varchar', 50, array()); 
     247    } 
     248} 
     249