Doctrine

Timestamp:

08/27/08 02:45:11 (10 months ago)

Author:

guilhermeblanco

Message:

Removed Doctrine_Relation::ONE_AGGREGATE, Doctrine_Relation::ONE_AGGREGATE in favor of a single one Doctrine_Relation::ONE.
Removed Doctrine_Relation::MANY_AGGREGATE, Doctrine_Relation::MANY_AGGREGATE in favor of a single one Doctrine_Relation::MANY.
Finished removal of ownsOne and ownsMany.

Location:

branches/1.0

Files:

• lib/Doctrine/Import/Builder.php (modified) (1 diff)
• lib/Doctrine/Record/Abstract.php (modified) (2 diffs)
• lib/Doctrine/Relation.php (modified) (3 diffs)
• tests/RecordTestCase.php (modified) (1 diff)
• tests/TableTestCase.php (modified) (2 diffs)

branches/1.0/lib/Doctrine/Import/Builder.php

@@ -440 +440 @@
                 }
 
-                if ($relation['type'] === Doctrine_Relation::ONE ||
-                    $relation['type'] === Doctrine_Relation::ONE_COMPOSITE) {
+                if ($relation['type'] === Doctrine_Relation::ONE) {
                     $ret[$i] = "    ".'$this->hasOne(\'' . $class . $alias . '\'';
                 } else {

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

@@ -194 +194 @@
     public function hasOne()
     {
-        $this->_table->bind(func_get_args(), Doctrine_Relation::ONE_AGGREGATE);
+        $this->_table->bind(func_get_args(), Doctrine_Relation::ONE);
 
         return $this;
@@ -210 +210 @@
     public function hasMany()
     {
-        $this->_table->bind(func_get_args(), Doctrine_Relation::MANY_AGGREGATE);
+        $this->_table->bind(func_get_args(), Doctrine_Relation::MANY);
 
         return $this;

branches/1.0/lib/Doctrine/Relation.php

@@ -39 +39 @@
 
     /**
-     * constant for ONE_TO_ONE and MANY_TO_ONE aggregate relationships
-     */
-    const ONE_AGGREGATE         = 0;
-
-    /**
-     * constant for ONE_TO_ONE and MANY_TO_ONE composite relationships
-     */
-    const ONE_COMPOSITE         = 1;
-
-    /**
-     * constant for MANY_TO_MANY and ONE_TO_MANY aggregate relationships
-     */
-    const MANY_AGGREGATE        = 2;
-
-    /**
-     * constant for MANY_TO_MANY and ONE_TO_MANY composite relationships
-     */
-    const MANY_COMPOSITE        = 3;
-
+     * constant for ONE_TO_ONE and MANY_TO_ONE relationships
+     */
     const ONE   = 0;
-    const MANY  = 2;
+    
+    /**
+     * constant for MANY_TO_MANY and ONE_TO_MANY relationships
+     */
+    const MANY  = 1;
     
     // TRUE => mandatory, everything else is just a default value. this should be refactored
@@ -307 +294 @@
 
     /**
-     * isComposite
-     * returns whether or not this relation is a composite relation
-     *
-     * @return boolean
-     */
-    final public function isComposite()
-    {
-        return ($this->definition['type'] == Doctrine_Relation::ONE_COMPOSITE ||
-                $this->definition['type'] == Doctrine_Relation::MANY_COMPOSITE);
-    }
-
-    /**
      * isOneToOne
      * returns whether or not this relation is a one-to-one relation
@@ -326 +301 @@
     final public function isOneToOne()
     {
-        return ($this->definition['type'] == Doctrine_Relation::ONE_AGGREGATE ||
-                $this->definition['type'] == Doctrine_Relation::ONE_COMPOSITE);
+        return ($this->definition['type'] == Doctrine_Relation::ONE);
     }
 

branches/1.0/tests/RecordTestCase.php

@@ -442 +442 @@
         $fk = $e->getTable()->getRelation("Child");
         $this->assertTrue($fk instanceof Doctrine_Relation_ForeignKey);
-        $this->assertEqual($fk->getType(), Doctrine_Relation::MANY_AGGREGATE);
+        $this->assertEqual($fk->getType(), Doctrine_Relation::MANY);
         $this->assertEqual($fk->getForeign(), "parent_id");
         $this->assertEqual($fk->getLocal(), "id");

branches/1.0/tests/TableTestCase.php

@@ -100 +100 @@
         $this->assertTrue($fk instanceof Doctrine_Relation_Association);
         $this->assertTrue($fk->getTable() instanceof Doctrine_Table);
-        $this->assertTrue($fk->getType() == Doctrine_Relation::MANY_AGGREGATE);
+        $this->assertTrue($fk->getType() == Doctrine_Relation::MANY);
         $this->assertTrue($fk->getLocal() == "user_id");
         $this->assertTrue($fk->getForeign() == "group_id");
@@ -107 +107 @@
         $this->assertTrue($fk instanceof Doctrine_Relation_LocalKey);
         $this->assertTrue($fk->getTable() instanceof Doctrine_Table);
-        $this->assertTrue($fk->getType() == Doctrine_Relation::ONE_AGGREGATE);
+        $this->assertTrue($fk->getType() == Doctrine_Relation::ONE);
         $this->assertTrue($fk->getLocal() == "email_id");
         $this->assertTrue($fk->getForeign() == $fk->getTable()->getIdentifier());