Doctrine

Timestamp:

03/19/08 01:51:50 (16 months ago)

Author:

jwage

Message:

Fixes from commented tests. Updating models to use updated syntax.

Location:

branches/0.10

Files:

• lib/Doctrine/Collection.php (modified) (1 diff)
• lib/Doctrine/Locking/Manager/Pessimistic.php (modified) (3 diffs)
• models/M2MTest.php (modified) (1 diff)
• models/M2MTest2.php (modified) (1 diff)
• models/MyUser.php (modified) (1 diff)
• models/MyUserGroup.php (modified) (1 diff)
• models/Resource.php (modified) (1 diff)
• models/ResourceType.php (modified) (1 diff)
• models/RTC1.php (modified) (1 diff)
• models/RTC2.php (modified) (1 diff)
• models/RTC3.php (modified) (1 diff)
• models/RTC4.php (modified) (1 diff)
• models/Task.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Collection.php

@@ -505 +505 @@
                 }
             }
-            $query->from($this->_table->getComponentName() . '(' . implode(", ",$this->_table->getPrimaryKeys()) . ')');
+            $query->from($this->_table->getComponentName());
             $query->where($this->_table->getComponentName() . '.id IN (' . substr(str_repeat("?, ", count($list)),0,-2) . ')');
 

branches/0.10/lib/Doctrine/Locking/Manager/Pessimistic.php

@@ -102 +102 @@
     {
         $objectType = $record->getTable()->getComponentName();
-        $key        = $record->obtainIdentifier();
+        $key        = $record->getTable()->getIdentifier();
 
         $gotLock = false;
@@ -171 +171 @@
     {
         $objectType = $record->getTable()->getComponentName();
-        $key        = $record->obtainIdentifier();
+        $key        = $record->getTable()->getIdentifier();
 
         if (is_array($key)) {
@@ -242 +242 @@
     {
         $objectType = $lockedRecord->getTable()->getComponentName();
-        $key        = $lockedRecord->obtainIdentifier();
+        $key        = $lockedRecord->getTable()->getIdentifier();
         return $this->_getLockingUserIdent($objectType, $key);
     }

branches/0.10/models/M2MTest.php

@@ -7 +7 @@
     public function setUp() {
 
-        $this->hasMany('RTC1 as RTC1', 'JC1.c1_id');
-        $this->hasMany('RTC2 as RTC2', 'JC1.c1_id');
-        $this->hasMany('RTC3 as RTC3', 'JC2.c1_id');
-        $this->hasMany('RTC3 as RTC4', 'JC1.c1_id');
+        $this->hasMany('RTC1 as RTC1', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC1'));
+        $this->hasMany('RTC2 as RTC2', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC1'));
+        $this->hasMany('RTC3 as RTC3', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC2'));
+        $this->hasMany('RTC3 as RTC4', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC1'));
 
     }

branches/0.10/models/M2MTest2.php

@@ -2 +2 @@
 class M2MTest2 extends Doctrine_Record {
     public function setTableDefinition() {
-        $this->hasColumn('oid', 'integer', 11, array('autoincrement', 'primary'));
+        $this->hasColumn('oid', 'integer', 11, array('autoincrement' => true, 'primary' => true));
         $this->hasColumn('name', 'string', 20);
     }
     public function setUp() {
-        $this->hasMany('RTC4 as RTC5', 'JC3.c1_id');
+        $this->hasMany('RTC4 as RTC5', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC3'));
     }
 }

branches/0.10/models/MyUser.php

@@ -1 +1 @@
 <?php
-class MyUser extends Doctrine_Record {
-    public function setTableDefinition() {
+class MyUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
         $this->hasColumn('name', 'string');
     }
-    public function setUp() {
-                $this->hasMany('MyOneThing', 'MyOneThing.user_id');
-                $this->hasMany('MyOtherThing', 'MyOtherThing.user_id');
+    
+    public function setUp()
+    {
+                  $this->hasMany('MyOneThing', 'MyOneThing.user_id');
+                  $this->hasMany('MyOtherThing', 'MyOtherThing.user_id');
     }
 }

branches/0.10/models/MyUserGroup.php

@@ -13 +13 @@
     public function setUp()
     {
-        $this->hasOne('MyGroup as MyGroup', 'MyUserGroup.group_id');
-        $this->hasOne('MyUser as MyUser', 'MyUserGroup.user_id');
+        $this->hasOne('MyGroup as MyGroup', array('local' => 'group_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+        $this->hasOne('MyUser as MyUser', array('local' => 'user_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
     }
 }

branches/0.10/models/Resource.php

@@ -2 +2 @@
 class Resource extends Doctrine_Record {
    public function setUp() {
-      $this->hasMany('Task as TaskAlias', 'Assignment.task_id');
-      $this->hasMany('ResourceType as Type', 'ResourceReference.type_id');
+      $this->hasMany('Task as TaskAlias', array('local'     =>  'resource_id',
+                                                'foreign'   =>  'task_id',
+                                                'refClass'  =>  'Assignment'));
+      $this->hasMany('ResourceType as Type', array('local'    => 'resource_id',
+                                                   'foreign'  => 'type_id',
+                                                   'refClass' => 'ResourceReference'));
    }
    public function setTableDefinition() {

branches/0.10/models/ResourceType.php

@@ -2 +2 @@
 class ResourceType extends Doctrine_Record {
     public function setUp() {
-        $this->hasMany('Resource as ResourceAlias', 'ResourceReference.resource_id');
+        $this->hasMany('Resource as ResourceAlias', array('local'    => 'type_id',
+                                                          'foreign'  => 'resource_id',
+                                                          'refClass' => 'ResourceReference'));
     }
     public function setTableDefinition() {

branches/0.10/models/RTC1.php

@@ -5 +5 @@
     }
     public function setUp() {
-        $this->hasMany('M2MTest as RTC1', 'JC1.c2_id');
+        $this->hasMany('M2MTest as RTC1', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC1'));
     }
 }

branches/0.10/models/RTC2.php

@@ -5 +5 @@
     }
     public function setUp() {
-        $this->hasMany('M2MTest as RTC2', 'JC1.c2_id');
+        $this->hasMany('M2MTest as RTC2', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC1'));
     }
 }

branches/0.10/models/RTC3.php

@@ -5 +5 @@
     }
     public function setUp() {
-        $this->hasMany('M2MTest as RTC3', 'JC2.c2_id');
-        $this->hasMany('M2MTest as RTC4', 'JC1.c2_id');
+        $this->hasMany('M2MTest as RTC3', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC2'));
+        $this->hasMany('M2MTest as RTC4', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC1'));
     }
 }

branches/0.10/models/RTC4.php

@@ -6 +6 @@
     }
     public function setUp() {
-        $this->hasMany('M2MTest2', 'JC3.c2_id');
+        $this->hasMany('M2MTest2', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC3'));
     }
 }

branches/0.10/models/Task.php

@@ -2 +2 @@
 class Task extends Doctrine_Record {
    public function setUp() {
-      $this->hasMany('Resource as ResourceAlias', 'Assignment.resource_id');
-      $this->hasMany('Task as Subtask', 'Subtask.parent_id');
+      $this->hasMany('Resource as ResourceAlias', array('local'     =>  'task_id',
+                                                        'foreign'   =>  'resource_id',
+                                                        'refClass'  =>  'Assignment'));
+      $this->hasMany('Task as Subtask', array('local' => 'id', 'foreign' => 'parent_id'));
    } 
    public function setTableDefinition() {