RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

DDC-1527 - Port bugfix for master branch

Browse source
This commit is contained in:
Benjamin Eberlei 2011-12-12 16:39:52 +01:00
parent bda98150c4
commit 43ef8765fd
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View file

@ -1433,7 +1433,7 @@ class BasicEntityPersister
{ {
switch (true) { switch (true) {
case (isset($this->_class->fieldMappings[$field])): case (isset($this->_class->fieldMappings[$field])):
$type = Type::getType($this->_class->fieldMappings[$field]['type'])->getBindingType(); $type = $this->_class->fieldMappings[$field]['type'];
break; break;
case (isset($this->_class->associationMappings[$field])): case (isset($this->_class->associationMappings[$field])):
@ -1448,7 +1448,7 @@ class BasicEntityPersister
$type = null; $type = null;
if (isset($targetClass->fieldNames[$targetColumn])) { if (isset($targetClass->fieldNames[$targetColumn])) {
$type = Type::getType($targetClass->fieldMappings[$targetClass->fieldNames[$targetColumn]]['type'])->getBindingType(); $type = $targetClass->fieldMappings[$targetClass->fieldNames[$targetColumn]]['type'];
} }
break; break;
@ -1456,8 +1456,8 @@ class BasicEntityPersister
default: default:
$type = null; $type = null;
} }
if (is_array($value)) { if (is_array($value)) {
$type = Type::getType( $type )->getBindingType();
$type += Connection::ARRAY_PARAM_OFFSET; $type += Connection::ARRAY_PARAM_OFFSET;
} }

5
tests/Doctrine/Tests/ORM/Functional/TypeTest.php
View file

@ -125,6 +125,9 @@ class TypeTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertInstanceOf('DateTime', $dateTimeDb->datetime); $this->assertInstanceOf('DateTime', $dateTimeDb->datetime);
$this->assertEquals('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s')); $this->assertEquals('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s'));
$articles = $this->_em->getRepository( 'Doctrine\Tests\Models\Generic\DateTimeModel' )->findBy( array( 'datetime' => new \DateTime( "now" ) ) );
$this->assertEquals( 0, count( $articles ) );
} }
public function testDqlQueryBindDateTimeInstance() public function testDqlQueryBindDateTimeInstance()
@ -176,4 +179,4 @@ class TypeTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertInstanceOf('DateTime', $dateTime->time); $this->assertInstanceOf('DateTime', $dateTime->time);
$this->assertEquals('19:27:20', $dateTime->time->format('H:i:s')); $this->assertEquals('19:27:20', $dateTime->time->format('H:i:s'));
} }
} }