Changeset 4341

Timestamp:

05/07/08 11:44:29 (8 months ago)

Author:

romanb

Message:

Fixed #540.

Location:

branches/0.11

Files:

• lib/Doctrine/Connection/UnitOfWork.php (modified) (1 diff)
• lib/Doctrine/Hydrator/RecordDriver.php (modified) (1 diff)
• tests/CustomResultSetOrderTestCase.php (modified) (1 diff)
• tests/Query/ReferenceModelTestCase.php (modified) (1 diff)
• tests/RecordTestCase.php (modified) (3 diffs)
• tests/Relation/AccessTestCase.php (modified) (3 diffs)
• tests/ValidatorTestCase.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Connection/UnitOfWork.php

@@ -476 +476 @@
         foreach ($tree as $name) {
             $table = $this->conn->getTable($name);
-
             foreach ($table->getRepository() as $record) {
-                $this->save($record);
-            }
-        }
-
-        // save all associations
-        foreach ($tree as $name) {
-            $table = $this->conn->getTable($name);
-
-            foreach ($table->getRepository() as $record) {
-                $this->saveAssociations($record);
+                $this->saveGraph($record);
             }
         }

branches/0.11/lib/Doctrine/Hydrator/RecordDriver.php

@@ -70 +70 @@
         $this->_collections[] = $coll;
     }
-
-    /**
-     * isIdentifiable
-     * returns whether or not a given data row is identifiable (it contains
-     * all primary key fields specified in the second argument)
-     *
-     * @param array $row
-     * @param Doctrine_Table $table
-     * @return boolean
-     */
-    /*public function isIdentifiable(array $row, Doctrine_Table $table)
-    {
-        $primaryKeys = $table->getIdentifierColumnNames();
-
-        if (is_array($primaryKeys)) {
-            foreach ($primaryKeys as $id) {
-                if ( ! isset($row[$id])) {
-                    return false;
-                }
-            }
-        } else {
-            if ( ! isset($row[$primaryKeys])) {
-                return false;
-            }
-        }
-        return true;
-    }*/
     
     public function getNullPointer() 

branches/0.11/tests/CustomResultSetOrderTestCase.php

@@ -42 +42 @@
      */
     public function prepareData() {
+        $this->connection->clear();
         $cat1 = new CategoryWithPosition();
         $cat1->position = 0;

branches/0.11/tests/Query/ReferenceModelTestCase.php

@@ -46 +46 @@
 
     public function testInitializeData() {
+        $this->connection->clear();
         $query = new Doctrine_Query($this->connection);
 

branches/0.11/tests/RecordTestCase.php

@@ -47 +47 @@
     public function testOne2OneForeign()
     {
+        $this->conn->clear();
         $user = new User();
         $user->name = "Richard Linklater";
@@ -336 +337 @@
     public function testManyToManyTreeStructure()
     {
-
+        $this->conn->clear();
         $task = $this->connection->create("Task");
 
@@ -413 +414 @@
     public function testTreeStructure()
     {
+        $this->conn->clear();
         $e = new Element();
 

branches/0.11/tests/Relation/AccessTestCase.php

@@ -2 +2 @@
 class Doctrine_Relation_Access_TestCase extends Doctrine_UnitTestCase {
     public function prepareData() {
+        $this->conn->clear();
         $o1 = new File_Owner();
         $o1->name = "owner1";
@@ -107 +108 @@
 
         $this->assertTrue(isset($owner1->Data_File));
-        $this->assertFalse(isset($owner2->Data_File));
-        $this->assertEqual(1, $check->get('id'));
-        $this->assertEqual(1, $owner1->get('id'));
+        $this->assertFalse(isset($owner2->Data_File));;
+        $this->assertIdentical($check, $owner1);
         $this->assertEqual($owner1->get('id'), $check->get('id'));
-        $this->assertEqual(2, $owner2->get('id'));
-
     }
 
@@ -134 +132 @@
         $this->assertTrue(isset($file1->File_Owner));
         $this->assertFalse(isset($file2->File_Owner));
-        $this->assertEqual(4, $check->get('id'));
-        $this->assertEqual(4, $file1->get('id'));
+        $this->assertIdentical($check, $file1);
         $this->assertEqual($file1->get('id'), $check->get('id'));
-        $this->assertEqual(1, $file2->get('id'));
-
     }
 

branches/0.11/tests/ValidatorTestCase.php

@@ -477 +477 @@
         $this->manager->setAttribute(Doctrine::ATTR_VALIDATE, Doctrine::VALIDATE_NONE);
     }
+    
+    public function testValidationIsTriggeredOnFlush()
+    {
+        $this->manager->setAttribute(Doctrine::ATTR_VALIDATE, Doctrine::VALIDATE_ALL);
+        $this->conn->clear();
+
+        $r = new ValidatorTest_Person();
+        $r->identifier = '5678';
+        $r->save();
+
+        $r = new ValidatorTest_Person();
+        $r->identifier = 5678;
+        try {
+            $this->conn->flush();
+            $this->fail("No validator exception thrown on unique validation, triggered by flush().");
+        } catch (Doctrine_Validator_Exception $e) {
+            $this->pass();
+        }
+        
+        $this->manager->setAttribute(Doctrine::ATTR_VALIDATE, Doctrine::VALIDATE_NONE);
+    }
 }