Changeset 4709

Timestamp:

07/24/08 03:32:03 (4 months ago)

Author:

guilhermeblanco

Message:

Added coverage to ticket #1219. This ticket works for me. Small changes in import.

Location:

branches

Files:

• 0.11/lib/Doctrine/Data/Import.php (modified) (2 diffs)
• 0.11/tests/Data/ImportTestCase.php (modified) (3 diffs)
• 1.0/lib/Doctrine/Data/Import.php (modified) (2 diffs)
• 1.0/tests/Data/ImportTestCase.php (modified) (3 diffs)

branches/0.11/lib/Doctrine/Data/Import.php

@@ -235 +235 @@
 
         foreach ($array as $className => $data) {
-            if ( ! empty($specifiedModels) && !in_array($className, $specifiedModels)) {
+            if ( ! empty($specifiedModels) && ! in_array($className, $specifiedModels)) {
                 continue;
             }
 
-            $templates = array_keys(Doctrine::getTable($className)->getTemplates());
-
-            if (in_array('Doctrine_Template_NestedSet', $templates)) {
+            if (Doctrine::getTable($className)->isTree()) {
                 $nestedSets[$className][] = $data;
                 $this->_buildNestedSetRows($className, $data);
@@ -274 +272 @@
             foreach ($tree as $model) {
                 foreach ($this->_importedObjects as $obj) {
-                    $templates = array_keys($obj->getTable()->getTemplates());
-                    
-                    if ($obj instanceof $model && ! in_array('Doctrine_Template_NestedSet', $templates)) {
+                    if ($obj instanceof $model && ! $obj->getTable()->isTree()) {
                         $obj->save();
                     }

branches/0.11/tests/Data/ImportTestCase.php

@@ -40 +40 @@
         $this->tables[] = 'I18nTest';
         $this->tables[] = 'ImportNestedSet';
+        $this->tables[] = 'ImportNestedSetMultipleTree';
         $this->tables[] = 'I18nNumberLang';
         parent::prepareTables();
@@ -256 +257 @@
         unlink('test.yml'); 
     }
+    
+    public function testImportNestedSetMultipleTreeData()
+    {
+        $yml = <<<END
+---
+ImportNestedSetMultipleTree:
+  ImportNestedSetMultipleTree_Item1:
+    name: Item 1
+
+    children:
+      ImportNestedSetMultipleTree_Item1_1:
+        name: Item 1.1
+
+      ImportNestedSetMultipleTree_Item1_2:
+        name: Item 1.2
+
+  ImportNestedSetMultipleTree_Item2:
+    name: Item 2
+
+    children:
+      ImportNestedSetMultipleTree_Item2_1:
+        name: Item 2.1
+
+      ImportNestedSetMultipleTree_Item2_2:
+        name: Item 2.2
+
+        children:
+          ImportNestedSetMultipleTree_Item2_2_1:
+            name: Item 2.2.1
+
+          ImportNestedSetMultipleTree_Item2_2_2:
+            name: Item 2.2.2
+
+          ImportNestedSetMultipleTree_Item2_2_3:
+            name: Item 2.2.3
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine::loadData('test.yml');
+
+            $this->conn->clear();
+
+            $query = Doctrine_Query::create()
+                ->from('ImportNestedSetMultipleTree insmt')
+                ->orderBy('insmt.root_id ASC, insmt.lft ASC');
+
+            $i = $query->execute(array(), Doctrine::FETCH_ARRAY);
+
+            $this->assertEqual($i[0]['name'], 'Item 1');
+            $this->assertEqual($i[0]['lft'], 1);
+            $this->assertEqual($i[0]['rgt'], 6);
+            $this->assertEqual($i[0]['level'], 0);
+            $this->assertEqual($i[0]['root_id'], '1');
+
+            $this->assertEqual($i[1]['name'], 'Item 1.1');
+            $this->assertEqual($i[1]['lft'], 2);
+            $this->assertEqual($i[1]['rgt'], 3);
+            $this->assertEqual($i[1]['level'], 1);
+            $this->assertEqual($i[1]['root_id'], $i[0]['root_id']);
+
+            $this->assertEqual($i[3]['name'], 'Item 2');
+            $this->assertEqual($i[3]['lft'], 1);
+            $this->assertEqual($i[3]['rgt'], 12);
+            $this->assertEqual($i[3]['level'], 0);
+            $this->assertEqual($i[3]['root_id'], '2');
+
+            $this->assertEqual($i[4]['name'], 'Item 2.1');
+            $this->assertEqual($i[4]['lft'], 2);
+            $this->assertEqual($i[4]['rgt'], 3);
+            $this->assertEqual($i[4]['level'], 1);
+            $this->assertEqual($i[4]['root_id'], $i[3]['root_id']);
+            
+            $this->assertEqual($i[5]['name'], 'Item 2.2');
+            $this->assertEqual($i[5]['lft'], 4);
+            $this->assertEqual($i[5]['rgt'], 11);
+            $this->assertEqual($i[5]['level'], 1);
+            $this->assertEqual($i[5]['root_id'], $i[3]['root_id']);
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        unlink('test.yml'); 
+    }
 
     public function testMany2ManyManualDataFixtures()
@@ -491 +577 @@
 }
 
+class ImportNestedSetMultipleTree extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs(
+            'NestedSet', array(
+                'hasManyRoots' => true,
+                'rootColumnName' => 'root_id'
+            )
+        );
+    }
+}
+
 class I18nNumberLang extends Doctrine_Record
 {

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

@@ -239 +239 @@
             }
 
-            $templates = array_keys(Doctrine::getTable($className)->getTemplates());
-
-            if (in_array('Doctrine_Template_NestedSet', $templates)) {
+            if (Doctrine::getTable($className)->isTree()) {
                 $nestedSets[$className][] = $data;
                 $this->_buildNestedSetRows($className, $data);
@@ -276 +274 @@
                     $templates = array_keys($obj->getTable()->getTemplates());
                     
-                    if ($obj instanceof $model && ! in_array('Doctrine_Template_NestedSet', $templates)) {
+                    if ($obj instanceof $model && ! $obj->getTable()->isTree()) {
                         $obj->save();
                     }

branches/1.0/tests/Data/ImportTestCase.php

@@ -40 +40 @@
         $this->tables[] = 'I18nTest';
         $this->tables[] = 'ImportNestedSet';
+        $this->tables[] = 'ImportNestedSetMultipleTree';
         $this->tables[] = 'I18nNumberLang';
         parent::prepareTables();
@@ -256 +257 @@
         unlink('test.yml'); 
     }
+    
+    public function testImportNestedSetMultipleTreeData()
+    {
+        $yml = <<<END
+---
+ImportNestedSetMultipleTree:
+  ImportNestedSetMultipleTree_Item1:
+    name: Item 1
+
+    children:
+      ImportNestedSetMultipleTree_Item1_1:
+        name: Item 1.1
+
+      ImportNestedSetMultipleTree_Item1_2:
+        name: Item 1.2
+
+  ImportNestedSetMultipleTree_Item2:
+    name: Item 2
+
+    children:
+      ImportNestedSetMultipleTree_Item2_1:
+        name: Item 2.1
+
+      ImportNestedSetMultipleTree_Item2_2:
+        name: Item 2.2
+
+        children:
+          ImportNestedSetMultipleTree_Item2_2_1:
+            name: Item 2.2.1
+
+          ImportNestedSetMultipleTree_Item2_2_2:
+            name: Item 2.2.2
+
+          ImportNestedSetMultipleTree_Item2_2_3:
+            name: Item 2.2.3
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine::loadData('test.yml');
+
+            $this->conn->clear();
+
+            $query = Doctrine_Query::create()
+                ->from('ImportNestedSetMultipleTree insmt')
+                ->orderBy('insmt.root_id ASC, insmt.lft ASC');
+
+            $i = $query->execute(array(), Doctrine::FETCH_ARRAY);
+
+            $this->assertEqual($i[0]['name'], 'Item 1');
+            $this->assertEqual($i[0]['lft'], 1);
+            $this->assertEqual($i[0]['rgt'], 6);
+            $this->assertEqual($i[0]['level'], 0);
+            $this->assertEqual($i[0]['root_id'], '1');
+
+            $this->assertEqual($i[1]['name'], 'Item 1.1');
+            $this->assertEqual($i[1]['lft'], 2);
+            $this->assertEqual($i[1]['rgt'], 3);
+            $this->assertEqual($i[1]['level'], 1);
+            $this->assertEqual($i[1]['root_id'], $i[0]['root_id']);
+
+            $this->assertEqual($i[3]['name'], 'Item 2');
+            $this->assertEqual($i[3]['lft'], 1);
+            $this->assertEqual($i[3]['rgt'], 12);
+            $this->assertEqual($i[3]['level'], 0);
+            $this->assertEqual($i[3]['root_id'], '2');
+
+            $this->assertEqual($i[4]['name'], 'Item 2.1');
+            $this->assertEqual($i[4]['lft'], 2);
+            $this->assertEqual($i[4]['rgt'], 3);
+            $this->assertEqual($i[4]['level'], 1);
+            $this->assertEqual($i[4]['root_id'], $i[3]['root_id']);
+            
+            $this->assertEqual($i[5]['name'], 'Item 2.2');
+            $this->assertEqual($i[5]['lft'], 4);
+            $this->assertEqual($i[5]['rgt'], 11);
+            $this->assertEqual($i[5]['level'], 1);
+            $this->assertEqual($i[5]['root_id'], $i[3]['root_id']);
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        unlink('test.yml'); 
+    }
 
     public function testMany2ManyManualDataFixtures()
@@ -491 +577 @@
 }
 
+class ImportNestedSetMultipleTree extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs(
+            'NestedSet', array(
+                'hasManyRoots' => true,
+                'rootColumnName' => 'root_id'
+            )
+        );
+    }
+}
+
 class I18nNumberLang extends Doctrine_Record
 {