Doctrine

Timestamp:

05/19/08 16:39:04 (14 months ago)

Author:

jwage

Message:

fixes #1051

Location:

branches/0.11

Files:

• lib/Doctrine/Data/Import.php (modified) (1 diff)
• tests/Data/ImportTestCase.php (modified) (3 diffs)

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

@@ -199 +199 @@
             } else if ($obj->getTable()->hasRelation($key)) {
                 if (is_array($value)) {
-                    if (isset($value[0])) {
+                    if (isset($value[0]) && ! is_array($value[0])) {
                         foreach ($value as $link) {
                             if ($obj->getTable()->getRelation($key)->getType() === Doctrine_Relation::ONE) {

branches/0.11/tests/Data/ImportTestCase.php

@@ -40 +40 @@
         $this->tables[] = 'I18nTest';
         $this->tables[] = 'ImportNestedSet';
+        $this->tables[] = 'I18nNumberLang';
         parent::prepareTables();
     }
@@ -434 +435 @@
         unlink('test.yml');
     }
+
+    public function testI18nImportWithInteger()
+    {
+        $yml = <<<END
+---
+I18nNumberLang:
+  I18nNumberLang_1:
+    name: test
+    Translation:
+      0:
+        title: english title
+        body: english body
+      1:
+        title: french title
+        body: french body
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine::loadData('test.yml');
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('I18nNumberLang i, i.Translation t');
+
+            $i = $query->execute()->getFirst();
+
+            $this->assertEqual($i->name, 'test');
+            $this->assertEqual($i->Translation['0']->title, 'english title');
+            $this->assertEqual($i->Translation['1']->title, 'french title');
+            $this->assertEqual($i->Translation['0']->body, 'english body');
+            $this->assertEqual($i->Translation['1']->body, 'french body');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        unlink('test.yml'); 
+    }
+
 }
 
@@ -448 +490 @@
     }
 }
+
+class I18nNumberLang extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('body', 'clob');
+    }
+
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields' => array('title', 'body'), 'type' => 'integer', 'length' => 4));
+    }
+}