Permalink
Browse files

Merge pull request #593 from norzechowicz/hydrator-fix

Fix SimpleObjectHydrator behavior when column not exists in fieldMappings, relationMappings and metaMappings
  • Loading branch information...
beberlei committed Mar 14, 2013
2 parents b53fffe + f951947 commit 4982e2b6b09f9c4acbd853f7d1052faeb79acf3b
@@ -176,10 +176,13 @@ protected function hydrateColumnInfo($entityName, $column)
// One solution is to load the association, but it might require extra efforts.
return array('name' => $column);
- default:
+ case (isset($this->_rsm->metaMappings[$column])):
return array(
'name' => $this->_rsm->metaMappings[$column]
);
+
+ default:
+ return null;
}
}
}
@@ -34,4 +34,28 @@ public function testMissingDiscriminatorColumnException()
$hydrator = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em);
$hydrator->hydrateAll($stmt, $rsm);
}
+
+ public function testExtraFieldInResultSetShouldBeIgnore()
+ {
+ $rsm = new ResultSetMapping;
+ $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a');
+ $rsm->addFieldResult('a', 'a__id', 'id');
+ $rsm->addFieldResult('a', 'a__city', 'city');
+ $resultSet = array(
+ array(
+ 'a__id' => '1',
+ 'a__city' => 'Cracow',
+ 'doctrine_rownum' => '1'
+ ),
+ );
+
+ $expectedEntity = new \Doctrine\Tests\Models\CMS\CmsAddress();
+ $expectedEntity->id = 1;
+ $expectedEntity->city = 'Cracow';
+
+ $stmt = new HydratorMockStatement($resultSet);
+ $hydrator = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em);
+ $result = $hydrator->hydrateAll($stmt, $rsm);
+ $this->assertEquals($result[0], $expectedEntity);
+ }
}

0 comments on commit 4982e2b

Please sign in to comment.