Changeset 4829

Timestamp:

08/27/08 03:30:02 (5 months ago)

Author:

guilhermeblanco

Message:

Dropped Doctrine_Record_Abstract::ownsOne and Doctrine_Record_Abstract::ownsMany as scheduled.

Location:

branches/1.0

Files:

• lib/Doctrine/Record/Abstract.php (modified) (1 diff)
• lib/Doctrine/Table.php (modified) (1 diff)
• tests/models/Entity.php (modified) (1 diff)
• tests/models/FilterTest.php (modified) (1 diff)
• tests/models/Package.php (modified) (1 diff)
• tests/models/QueryTest_Board.php (modified) (2 diffs)
• tests/models/QueryTest_Category.php (modified) (2 diffs)
• tests/models/QueryTest_Entry.php (modified) (1 diff)
• tests/models/Rec1.php (modified) (1 diff)
• tests/models/Rec2.php (modified) (1 diff)
• tests/models/ValidatorTest_Person.php (modified) (1 diff)
• tests/TableTestCase.php (modified) (1 diff)

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

@@ -184 +184 @@
 
     /**
-     * DEPRECATED ALSO? - REMOVE SOON
-     *
-     * ownsOne
-     * binds One-to-One composite relation
-     *
-     * @param string $componentName     the name of the related component
-     * @param string $options           relation options
-     * @see Doctrine_Relation::_$definition
-     * @return Doctrine_Record          this object
-     */
-    public function ownsOne()
-    {
-        $this->_table->bind(func_get_args(), Doctrine_Relation::ONE_COMPOSITE);
-        
-        return $this;
-    }
-
-    /**
-     * DEPRECATED - REMOVE SOON
-     *
-     * ownsMany
-     * binds One-to-Many / Many-to-Many composite relation
-     *
-     * @param string $componentName     the name of the related component
-     * @param string $options           relation options
-     * @see Doctrine_Relation::_$definition
-     * @return Doctrine_Record          this object
-     */
-    public function ownsMany()
-    {
-        $this->_table->bind(func_get_args(), Doctrine_Relation::MANY_COMPOSITE);
-        return $this;
-    }
-
-    /**
      * hasOne
      * binds One-to-One aggregate relation

branches/1.0/lib/Doctrine/Table.php

@@ -639 +639 @@
                 if ($relation->getTable() === $this && in_array($relation->getLocal(), $primary)) {
                     if ($relation->hasConstraint()) {
-                        throw new Doctrine_Table_Exception("Badly constructed integrity constraints.");
+                        throw new Doctrine_Table_Exception("Badly constructed integrity constraints. Cannot define constraint of different fields in the same table.");
                     }
                     continue;

branches/1.0/tests/models/Entity.php

@@ -4 +4 @@
     public function setUp() 
     {
-        $this->ownsOne('Email', array('local' => 'email_id'));
+        $this->hasOne('Email', array('local' => 'email_id', 'onDelete' => 'CASCADE'));
         $this->hasMany('Phonenumber', array('local' => 'id', 'foreign' => 'entity_id'));
-        $this->ownsOne('Account', array('foreign' => 'entity_id'));
+        $this->hasOne('Account', array('foreign' => 'entity_id', 'onDelete' => 'CASCADE'));
         $this->hasMany('Entity', array('local' => 'entity1', 
             'refClass' => 'EntityReference',

branches/1.0/tests/models/FilterTest.php

@@ -5 +5 @@
     }
     public function setUp() {
-        $this->ownsMany('FilterTest2 as filtered', 'FilterTest2.test1_id');
+        $this->hasMany('FilterTest2 as filtered', array('local' => 'id', 'foreign' => 'test1_id', 'onDelete' => 'CASCADE'));
     }
 }

branches/1.0/tests/models/Package.php

@@ -7 +7 @@
     public function setUp()
     {
-        $this->ownsMany('PackageVersion as Version', 'PackageVersion.package_id');
+        $this->hasMany('PackageVersion as Version', array('local' => 'id', 'foreign' => 'package_id', 'onDelete' => 'CASCADE'));
     }
 }

branches/1.0/tests/models/QueryTest_Board.php

@@ -6 +6 @@
      */
     public function setTableDefinition()
-    {        
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary', 'autoincrement', 'notnull'));
         $this->hasColumn('categoryId as categoryId', 'integer', 4,
                 array('notnull'));
@@ -22 +23 @@
     public function setUp()
     {
-        $this->hasOne('QueryTest_Category as category', 'QueryTest_Board.categoryId');
-        $this->ownsOne('QueryTest_Entry as lastEntry', 'QueryTest_Board.lastEntryId');
+        $this->hasOne('QueryTest_Category as category', array(
+            'local' => 'categoryId', 'foreign' => 'id'
+        ));
+        $this->hasOne('QueryTest_Entry as lastEntry', array(
+            'local' => 'lastEntryId', 'foreign' => 'id', 'onDelete' => 'CASCADE'
+        ));
     }
 }

branches/1.0/tests/models/QueryTest_Category.php

@@ -14 +14 @@
      */
     public function setTableDefinition()
-    {        
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary', 'autoincrement', 'notnull'));
         $this->hasColumn('rootCategoryId as rootCategoryId', 'integer', 4,
-                array('default' => 0));
+                array('notnull', 'default' => 0));
         $this->hasColumn('parentCategoryId as parentCategoryId', 'integer', 4,
                 array('notnull', 'default' => 0));
@@ -30 +31 @@
     public function setUp()
     {
-        $this->ownsMany('QueryTest_Category as subCategories', 'subCategories.parentCategoryId');
-        $this->hasOne('QueryTest_Category as rootCategory', 'QueryTest_Category.rootCategoryId');
-        $this->ownsMany('QueryTest_Board as boards', 'QueryTest_Board.categoryId');
+        $this->hasMany('QueryTest_Category as subCategories', array(
+            'local' => 'id', 'foreign' => 'parentCategoryId'
+        ));
+        $this->hasOne('QueryTest_Category as rootCategory', array(
+            'local' => 'rootCategoryId', 'foreign' => 'id'
+        ));
+        $this->hasMany('QueryTest_Board as boards', array(
+            'local' => 'id', 'foreign' => 'categoryId', 'onDelete' => 'CASCADE'
+        ));
     }
 }

branches/1.0/tests/models/QueryTest_Entry.php

@@ -7 +7 @@
     public function setTableDefinition()
     {        
+        $this->hasColumn('id', 'integer', 4, array('primary', 'autoincrement', 'notnull'));
         $this->hasColumn('authorId', 'integer', 4,
                 array('notnull'));

branches/1.0/tests/models/Rec1.php

@@ -9 +9 @@
     public function setUp()
     {
-        $this->ownsOne('Rec2 as Account', array('local' => 'id', 'foreign' => 'user_id'));
+        $this->hasOne('Rec2 as Account', array('local' => 'id', 'foreign' => 'user_id', 'onDelete' => 'CASCADE'));
     }
 }

branches/1.0/tests/models/Rec2.php

@@ -10 +10 @@
     public function setUp()
     {
-        $this->ownsOne('Rec1 as User', 'Rec2.user_id');
+        $this->hasOne('Rec1 as User', array('local' => 'id', 'foreign' => 'user_id', 'onDelete' => 'CASCADE'));
     }
 

branches/1.0/tests/models/ValidatorTest_Person.php

@@ -7 +7 @@
    
    public function setUp() {
-      $this->ownsOne('ValidatorTest_FootballPlayer', 'ValidatorTest_FootballPlayer.person_id');
+      $this->hasOne('ValidatorTest_FootballPlayer', array(
+          'local' => 'id', 'foreign' => 'person_id', 'onDelete' => 'CASCADE'
+      ));
    }
 }

branches/1.0/tests/TableTestCase.php

@@ -107 +107 @@
         $this->assertTrue($fk instanceof Doctrine_Relation_LocalKey);
         $this->assertTrue($fk->getTable() instanceof Doctrine_Table);
-        $this->assertTrue($fk->getType() == Doctrine_Relation::ONE_COMPOSITE);
+        $this->assertTrue($fk->getType() == Doctrine_Relation::ONE_AGGREGATE);
         $this->assertTrue($fk->getLocal() == "email_id");
         $this->assertTrue($fk->getForeign() == $fk->getTable()->getIdentifier());