Changeset 3701 for trunk/tests/Ticket

Show
Ignore:
Timestamp:
02/03/08 21:29:57 (11 months ago)
Author:
romanb
Message:

Merged r3518:r3700 from branch to trunk. Branch to be deleted, soon. Development continues in trunk.

Location:
trunk/tests/Ticket
Files:
12 modified

Legend:

Unmodified
Added
Removed

  • trunk/tests/Ticket/428TestCase.php

    r2401 r3701  
    1414class Doctrine_Ticket_428_TestCase extends Doctrine_UnitTestCase 
    1515{ 
     16    public function prepareTables() 
     17    { 
     18        $this->tables = array('Album', 'Song'); 
     19        parent::prepareTables(); 
     20    } 
     21     
    1622    public function prepareData() 
    1723    { 
    … …  
    3945        $q->select('a.name, COUNT(s.id) count')->from('Album a')->leftJoin('a.Song s')->groupby('a.id'); 
    4046        $albums = $q->execute(); 
    41  
     47         
    4248        // Should not reuse the existing collection in this case 
    4349        $this->assertEqual(count($albums[0]->Song), 1); 

  • trunk/tests/Ticket/438TestCase.php

    r3293 r3701  
    110110class T438_Student extends Doctrine_Record 
    111111{ 
    112   public function setTableDefinition() 
     112  public static function initMetadata($class) 
    113113  { 
    114     $this->setTableName('t438_student_record'); 
    115  
    116     $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
    117     $this->hasColumn('s_name as name', 'varchar', 50, array ()); 
    118   } 
    119    
    120   public function setUp() 
    121   { 
    122     $this->hasMany('T438_Course as StudyCourses', array('refClass' => 'T438_StudentCourse', 'local' => 'sc_student_id', 'foreign' => 'sc_course_id')); 
     114    $class->setTableName('t438_student_record'); 
     115    $class->setColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
     116    $class->setColumn('s_name as name', 'varchar', 50, array ()); 
     117    $class->hasMany('T438_Course as StudyCourses', array('refClass' => 'T438_StudentCourse', 'local' => 'sc_student_id', 'foreign' => 'sc_course_id')); 
    123118  } 
    124119} 
    … …  
    127122class T438_Course extends Doctrine_Record 
    128123{ 
    129   public function setTableDefinition() 
     124  public static function initMetadata($class) 
    130125  { 
    131     $this->setTableName('t438_course'); 
    132  
    133     $this->hasColumn('c_id as id', 'varchar', 20, array (  'primary' => true,)); 
    134     $this->hasColumn('c_name as name', 'varchar', 50, array ()); 
    135   } 
    136    
    137   public function setUp() 
    138   { 
    139     $this->hasMany('T438_Student as Students', array('refClass' => 'T438_StudentCourse', 'local' => 'sc_course_id', 'foreign' => 'sc_student_id')); 
     126    $class->setTableName('t438_course'); 
     127    $class->setColumn('c_id as id', 'varchar', 20, array (  'primary' => true,)); 
     128    $class->setColumn('c_name as name', 'varchar', 50, array ()); 
     129    $class->hasMany('T438_Student as Students', array('refClass' => 'T438_StudentCourse', 'local' => 'sc_course_id', 'foreign' => 'sc_student_id')); 
    140130  } 
    141131} 
    … …  
    143133class T438_StudentCourse extends Doctrine_Record 
    144134{ 
    145   public function setTableDefinition() 
     135  public static function initMetadata($class) 
    146136  { 
    147     $this->setTableName('t438_student_course'); 
    148  
    149     $this->hasColumn('sc_student_id as student_id', 'varchar', 30, array (  'primary' => true,)); 
    150     $this->hasColumn('sc_course_id as course_id', 'varchar', 20, array (  'primary' => true,)); 
    151     $this->hasColumn('sc_remark  as remark', 'varchar', 500, array ()); 
    152   } 
    153    
    154   public function setUp() 
    155   { 
    156     $this->hasOne('T438_Student as Student', array('local' => 'sc_student_id', 'foreign' => 's_id')); 
    157     $this->hasOne('T438_Course as Course', array('local' => 'sc_course_id', 'foreign' => 'c_id')); 
     137    $class->setTableName('t438_student_course'); 
     138    $class->setColumn('sc_student_id as student_id', 'varchar', 30, array (  'primary' => true,)); 
     139    $class->setColumn('sc_course_id as course_id', 'varchar', 20, array (  'primary' => true,)); 
     140    $class->setColumn('sc_remark  as remark', 'varchar', 500, array ()); 
     141    $class->hasOne('T438_Student as Student', array('local' => 'sc_student_id', 'foreign' => 's_id')); 
     142    $class->hasOne('T438_Course as Course', array('local' => 'sc_course_id', 'foreign' => 'c_id')); 
    158143  } 
    159144} 

  • trunk/tests/Ticket/480TestCase.php

    r3565 r3701  
    3434class stComment extends Doctrine_Record 
    3535{ 
    36     public function setTableDefinition() 
     36    public static function initMetadata($class) 
    3737    { 
    38         $this->setTableName('st_comment'); 
    39         $this->hasColumn('title', 'string', 100, array()); 
    40         $this->hasColumn('body', 'string', 1000, array()); 
     38        $class->setTableName('st_comment'); 
     39        $class->setColumn('title', 'string', 100, array()); 
     40        $class->setColumn('body', 'string', 1000, array()); 
    4141    } 
    4242} 

  • trunk/tests/Ticket/626BTestCase.php

    r3291 r3701  
    9191class T626B_Student extends Doctrine_Record 
    9292{ 
    93   public function setTableDefinition() 
     93  public static function initMetadata($class) 
    9494  { 
    95     $this->setTableName('T626B_Student_record'); 
     95    $class->setTableName('T626B_Student_record'); 
    9696 
    97     $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
    98     $this->hasColumn('s_g_id as group_id', 'varchar', 30, array ('notnull'=>true)); 
    99     $this->hasColumn('s_name as name', 'varchar', 50, array ()); 
    100   } 
    101    
    102   public function setUp() 
    103   { 
    104     $this->hasMany('T626_Course as StudyCourses', array('refClass' => 'T626B_StudentCourse', 'local' => 'sc_student_id', 'foreign' => 'sc_course_id')); 
    105     $this->hasOne('T626_Group as Group', array('local' => 's_g_id', 'foreign' => 'g_id')); 
     97    $class->setColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
     98    $class->setColumn('s_g_id as group_id', 'varchar', 30, array ('notnull'=>true)); 
     99    $class->setColumn('s_name as name', 'varchar', 50, array ()); 
     100     
     101    $class->hasMany('T626_Course as StudyCourses', array('refClass' => 'T626B_StudentCourse', 'local' => 'sc_student_id', 'foreign' => 'sc_course_id')); 
     102    $class->hasOne('T626_Group as Group', array('local' => 's_g_id', 'foreign' => 'g_id')); 
    106103  } 
    107104} 
    … …  
    109106class T626_Group extends Doctrine_Record 
    110107{ 
    111   public function setTableDefinition() 
     108  public static function initMetadata($class) 
    112109  { 
    113     $this->setTableName('T626B_Student_group'); 
     110    $class->setTableName('T626B_Student_group'); 
    114111 
    115     $this->hasColumn('g_id as id', 'varchar', 30, array (  'primary' => true,)); 
    116     $this->hasColumn('g_name as name', 'varchar', 50, array ()); 
    117   } 
    118    
    119   public function setUp() 
    120   { 
    121     $this->hasMany('T626B_Student as Students',  
    122       array('local' => 'g_id', 'foreign' => 's_id')); 
     112    $class->setColumn('g_id as id', 'varchar', 30, array (  'primary' => true,)); 
     113    $class->setColumn('g_name as name', 'varchar', 50, array ()); 
     114     
     115    $class->hasMany('T626B_Student as Students', array('local' => 'g_id', 'foreign' => 's_id')); 
    123116  } 
    124117} 
    … …  
    127120class T626_Course extends Doctrine_Record 
    128121{ 
    129   public function setTableDefinition() 
     122  public static function initMetadata($class) 
    130123  { 
    131     $this->setTableName('T626_course'); 
     124    $class->setTableName('T626_course'); 
    132125 
    133     $this->hasColumn('c_id as id', 'varchar', 20, array (  'primary' => true,)); 
    134     $this->hasColumn('c_name as name', 'varchar', 50, array ()); 
    135   } 
    136    
    137   public function setUp() 
    138   { 
    139     $this->hasMany('T626B_Student as Students', array('refClass' => 'T626B_StudentCourse', 'local' => 'sc_course_id', 'foreign' => 'sc_student_id')); 
     126    $class->setColumn('c_id as id', 'varchar', 20, array (  'primary' => true,)); 
     127    $class->setColumn('c_name as name', 'varchar', 50, array ()); 
     128    $class->hasMany('T626B_Student as Students', array('refClass' => 'T626B_StudentCourse', 'local' => 'sc_course_id', 'foreign' => 'sc_student_id')); 
    140129  } 
    141130} 
    … …  
    143132class T626B_StudentCourse extends Doctrine_Record 
    144133{ 
    145   public function setTableDefinition() 
     134  public static function initMetadata($class) 
    146135  { 
    147     $this->setTableName('T626B_Student_course'); 
     136    $class->setTableName('T626B_Student_course'); 
    148137 
    149     $this->hasColumn('sc_student_id as student_id', 'varchar', 30, array (  'primary' => true,)); 
    150     $this->hasColumn('sc_course_id as course_id', 'varchar', 20, array (  'primary' => true,)); 
    151     $this->hasColumn('sc_remark  as remark', 'varchar', 500, array ()); 
    152   } 
    153    
    154   public function setUp() 
    155   { 
    156     $this->hasOne('T626B_Student as Student', array('local' => 'sc_student_id', 'foreign' => 's_id')); 
    157     $this->hasOne('T626_Course as Course', array('local' => 'sc_course_id', 'foreign' => 'c_id')); 
     138    $class->setColumn('sc_student_id as student_id', 'varchar', 30, array (  'primary' => true,)); 
     139    $class->setColumn('sc_course_id as course_id', 'varchar', 20, array (  'primary' => true,)); 
     140    $class->setColumn('sc_remark  as remark', 'varchar', 500, array ()); 
     141    $class->hasOne('T626B_Student as Student', array('local' => 'sc_student_id', 'foreign' => 's_id')); 
     142    $class->hasOne('T626_Course as Course', array('local' => 'sc_course_id', 'foreign' => 'c_id')); 
    158143  } 
    159144} 

  • trunk/tests/Ticket/626CTestCase.php

    r3311 r3701  
    6565class T626C_Student1 extends Doctrine_Record 
    6666{ 
    67   public function setTableDefinition() 
     67  public static function initMetadata($class) 
    6868  { 
    69     $this->setTableName('T626C_Student_record_1'); 
     69    $class->setTableName('T626C_Student_record_1'); 
    7070 
    71     $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
    72     $this->hasColumn('s_name as name', 'varchar', 50, array ()); 
     71    $class->setColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
     72    $class->setColumn('s_name as name', 'varchar', 50, array ()); 
    7373  } 
    7474} 
    … …  
    7676class T626C_Student2 extends Doctrine_Record 
    7777{ 
    78   public function setTableDefinition() 
     78  public static function initMetadata($class) 
    7979  { 
    80     $this->setTableName('T626C_Student_record_2'); 
     80    $class->setTableName('T626C_Student_record_2'); 
    8181 
    82     $this->hasColumn('id', 'varchar', 30, array (  'primary' => true,)); 
    83     $this->hasColumn('name', 'varchar', 50, array ()); 
     82    $class->setColumn('id', 'varchar', 30, array (  'primary' => true,)); 
     83    $class->setColumn('name', 'varchar', 50, array ()); 
    8484  } 
    8585} 

  • trunk/tests/Ticket/626DTestCase.php

    r3460 r3701  
    4949class T626D_Student1 extends Doctrine_Record 
    5050{ 
    51   public function setTableDefinition() 
     51  public static function initMetadata($class) 
    5252  { 
    53     $this->setTableName('T626D_Student_record_1'); 
     53    $class->setTableName('T626D_Student_record_1'); 
    5454 
    55     $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
    56     $this->hasColumn('s_name as name', 'varchar', 50, array ()); 
     55    $class->setColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
     56    $class->setColumn('s_name as name', 'varchar', 50, array ()); 
    5757  } 
    5858} 

  • trunk/tests/Ticket/638TestCase.php

    r3460 r3701  
    108108class T638_Student extends Doctrine_Record 
    109109{ 
    110   public function setTableDefinition() 
     110  public static function initMetadata($class) 
    111111  { 
    112     $this->setTableName('T638_student'); 
     112    $class->setTableName('T638_student'); 
    113113 
    114     $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
    115     $this->hasColumn('s_g_id as group_id', 'varchar', 30, array ('notnull'=>true)); 
    116     $this->hasColumn('s_name as name', 'varchar', 50, array ('notnull'=>true)); 
     114    $class->setColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
     115    $class->setColumn('s_g_id as group_id', 'varchar', 30, array ('notnull'=>true)); 
     116    $class->setColumn('s_name as name', 'varchar', 50, array ('notnull'=>true)); 
    117117  } 
    118118   
    119   public function setUp() 
    120   { 
    121   } 
    122119} 
    123120 
    124121class T638_Course extends Doctrine_Record 
    125122{ 
    126   public function setTableDefinition() 
     123  public static function initMetadata($class) 
    127124  { 
    128     $this->setTableName('T638_course'); 
     125    $class->setTableName('T638_course'); 
    129126 
    130     $this->hasColumn('c_id as id', 'varchar', 20, array (  'primary' => true,)); 
    131     $this->hasColumn('c_name as name', 'varchar', 50, array ('notnull'=>true)); 
    132   } 
    133    
    134   public function setUp() 
    135   { 
     127    $class->setColumn('c_id as id', 'varchar', 20, array (  'primary' => true,)); 
     128    $class->setColumn('c_name as name', 'varchar', 50, array ('notnull'=>true)); 
    136129  } 
    137130 
    … …  
    144137class T638_StudentCourse extends Doctrine_Record 
    145138{ 
    146   public function setTableDefinition() 
     139  public static function initMetadata($class) 
    147140  { 
    148     $this->setTableName('T638_Student_course'); 
     141    $class->setTableName('T638_Student_course'); 
    149142 
    150     $this->hasColumn('sc_student_id as student_id', 'varchar', 30, array (  'primary' => true,)); 
    151     $this->hasColumn('sc_course_id as course_id', 'varchar', 20, array (  'primary' => true,)); 
    152     $this->hasColumn('sc_remark  as remark', 'varchar', 500, array ('notnull'=>true)); 
    153   } 
    154    
    155   public function setUp() 
    156   { 
    157     $this->hasOne('T638_Student as Student', array('local' => 'sc_student_id', 'foreign' => 's_id')); 
    158     $this->hasOne('T638_Course as Course', array('local' => 'sc_course_id', 'foreign' => 'c_id')); 
     143    $class->setColumn('sc_student_id as student_id', 'varchar', 30, array (  'primary' => true,)); 
     144    $class->setColumn('sc_course_id as course_id', 'varchar', 20, array (  'primary' => true,)); 
     145    $class->setColumn('sc_remark  as remark', 'varchar', 500, array ('notnull'=>true)); 
     146     
     147    $class->hasOne('T638_Student as Student', array('local' => 'sc_student_id', 'foreign' => 's_id')); 
     148    $class->hasOne('T638_Course as Course', array('local' => 'sc_course_id', 'foreign' => 'c_id')); 
    159149  } 
    160150} 

  • trunk/tests/Ticket/642TestCase.php

    r3297 r3701  
    5353class stDummyObj extends Doctrine_Record 
    5454{ 
    55     public function setTableDefinition() 
     55    public static function initMetadata($class) 
    5656    { 
    57         $this->setTableName('st_dummy_obj'); 
    58         $this->hasColumn('startDate', 'timestamp', null, array( 
     57        $class->setTableName('st_dummy_obj'); 
     58        $class->setColumn('startDate', 'timestamp', null, array( 
    5959            'notnull' => true,  
    6060            'default' => '0000-00-00 00:00:00' 

  • trunk/tests/Ticket/673TestCase.php

    r3393 r3701  
    6161class T673_Student extends Doctrine_Record 
    6262{ 
    63   public function setTableDefinition() 
     63  public static function initMetadata($class) 
    6464  { 
    65     $this->setTableName('T673_Student_record'); 
     65    $class->setTableName('T673_Student_record'); 
    6666 
    67     $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
    68     $this->hasColumn('s_foo as foo', 'integer', 4, array ('notnull'=>true)); 
    69     $this->hasColumn('s_name as name', 'varchar', 50, array ()); 
     67    $class->setColumn('s_id as id', 'varchar', 30, array (  'primary' => true,)); 
     68    $class->setColumn('s_foo as foo', 'integer', 4, array ('notnull'=>true)); 
     69    $class->setColumn('s_name as name', 'varchar', 50, array ()); 
    7070  } 
    7171} 

  • trunk/tests/Ticket/697TestCase.php

    r3460 r3701  
    2323 
    2424    public function testIdsAreSetWhenSavingSubclassInstancesInCTI() 
    25     { 
    26         $personTable = $this->conn->getTable('T697_Person'); 
    27         $userTable = $this->conn->getTable('T697_User'); 
    28         //var_dump($userTable->getColumns()); 
    29          
     25    {         
    3026        $p = new T697_Person(); 
    3127        $p['name']='Rodrigo'; 
    … …  
    4339class T697_Person extends Doctrine_Record 
    4440{ 
    45     public function setTableDefinition() 
     41    public static function initMetadata($class) 
    4642    { 
    47         $this->setInheritanceType(Doctrine::INHERITANCETYPE_JOINED, 
    48                 array('T697_Person' => array('dtype' => 1), 'T697_User' => array('dtype' => 2))); 
    49         $this->setTableName('t697_person'); 
    50         $this->hasColumn('name', 'string', 30); 
    51         $this->hasColumn('dtype', 'integer', 4); 
     43        $class->setInheritanceType(Doctrine::INHERITANCETYPE_JOINED, array( 
     44                'discriminatorColumn' => 'dtype', 
     45                'discriminatorMap' => array( 
     46                        1 => 'T697_Person', 2 => 'T697_User' 
     47                        ) 
     48                )); 
     49        $class->setSubclasses(array('T697_User')); 
     50        $class->setTableName('t697_person'); 
     51        $class->setColumn('name', 'string', 30); 
     52        $class->setColumn('dtype', 'integer', 4); 
    5253    } 
    5354} 
    … …  
    5556//Class table inheritance 
    5657class T697_User extends T697_Person { 
    57     public function setTableDefinition() 
     58    public static function initMetadata($class) 
    5859    { 
    59         $this->setTableName('t697_user'); 
    60         $this->hasColumn('password', 'string', 30); 
     60        $class->setTableName('t697_user'); 
     61        $class->setColumn('password', 'string', 30); 
    6162    } 
    6263} 

  • trunk/tests/Ticket/741TestCase.php

    r3576 r3701  
    3232class Parent741 extends Doctrine_Record 
    3333{ 
    34   public function setTableDefinition() 
     34  public static function initMetadata($class) 
    3535  { 
    36     $this->hasColumn('id', 'integer', 4, array ( 
     36    $class->setColumn('id', 'integer', 4, array ( 
    3737      'primary' => true, 
    3838      'autoincrement' => true, 
    … …  
    4040    )); 
    4141 
    42     $this->hasColumn('amount', 'integer'); 
    43   } 
    44  
    45   public function setUp() 
    46   { 
    47     $this->hasMany('Child741 as Cows', array('local' => 'id', 'foreign' => 'moo_id')); 
     42    $class->setColumn('amount', 'integer'); 
     43    $class->hasMany('Child741 as Cows', array('local' => 'id', 'foreign' => 'moo_id')); 
    4844  } 
    4945} 
    … …  
    5147class Child741 extends Doctrine_Record 
    5248{ 
    53   public function setTableDefinition() 
     49  public static function initMetadata($class) 
    5450  { 
    55     $this->hasColumn('id', 'integer', 4, array ( 
     51    $class->setColumn('id', 'integer', 4, array ( 
    5652      'primary' => true, 
    5753      'autoincrement' => true, 
    … …  
    5955    )); 
    6056 
    61     $this->hasColumn('moo_id', 'integer'); 
    62   } 
    63  
    64   public function setUp() 
    65   { 
    66     $this->hasOne('Parent741 as Moo', array('local' => 'moo_id', 'foreign' => 'id')); 
     57    $class->setColumn('moo_id', 'integer'); 
     58    $class->hasOne('Parent741 as Moo', array('local' => 'moo_id', 'foreign' => 'id')); 
    6759  } 
    6860 
    … …  
    8779  } 
    8880} 
    89  
    90  

  • trunk/tests/Ticket/NjeroTestCase.php

    r2488 r3701  
    1717    public function prepareTables() 
    1818    { 
     19        $this->tables = array(); 
    1920        $this->tables[] = 'CoverageCodeN'; 
    2021        $this->tables[] = 'PolicyCodeN';