Changeset 3701 for trunk/tests/Record

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.

Files:

• trunk/tests/Record/FilterTestCase.php (modified) (1 diff)

trunk/tests/Record/FilterTestCase.php

@@ -87 +87 @@
 class CompositeRecord extends Doctrine_Record
 {
-    public function setTableDefinition()
+    public static function initMetadata($class)
     {
-        $this->hasColumn('name', 'string');
-    }
-    public function setUp()
-    {
-        $this->hasOne('RelatedCompositeRecord as Related', array('foreign' => 'foreign_id'));
+        $class->setColumn('name', 'string');
+        $class->hasOne('RelatedCompositeRecord as Related', array('local' => 'id', 'foreign' => 'foreign_id'));
 
-        $this->unshiftFilter(new Doctrine_Record_Filter_Compound(array('Related')));
+        $class->unshiftFilter(new Doctrine_Record_Filter_Compound(array('Related')));
     }
 }
 class RelatedCompositeRecord extends Doctrine_Record
 {
-    public function setTableDefinition()
+    public static function initMetadata($class)
     {
-        $this->hasColumn('address', 'string');
-        $this->hasColumn('foreign_id', 'integer');
+        $class->setColumn('address', 'string');
+        $class->setColumn('foreign_id', 'integer');
     }
 }