RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-141] Fixed.

Browse Source
This commit is contained in:
romanb 2009-11-13 10:11:14 +00:00
parent fa99b94420
commit 3a282b1e9c
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -1115,9 +1115,7 @@ class SqlWalker implements TreeWalker
$discrSql = $this->_generateDiscriminatorColumnConditionSql($this->_currentRootAlias);
if ($discrSql) {
if ($termsSql) $sql .= ' AND';
$sql .= ' ' . $discrSql;
$sql .= ' AND ' . $discrSql;
}
return $sql;

25
tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php
View File

@ -22,8 +22,6 @@ class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\RelatedEntity')
));
} catch (\Exception $e) {
var_dump($e->getMessage());
var_dump($e->getTraceAsString());
// Swallow all exceptions. We do not test the schema tool here.
}
}
@ -94,7 +92,28 @@ class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
$query = $this->_em->createQuery("delete Doctrine\Tests\ORM\Functional\ParentEntity e");
$affected = $query->execute();
$this->assertEquals(2, $affected);
$this->assertEquals(2, $affected);
$this->_em->clear();
// DQL query with WHERE clause
$child = new ChildEntity;
$child->setData('thedata');
$child->setNumber(1234);
$this->_em->persist($child);
$this->_em->flush();
$this->_em->clear();
$query = $this->_em->createQuery('select e from Doctrine\Tests\ORM\Functional\ParentEntity e where e.id=?1');
$query->setParameter(1, $child->getId());
$child2 = $query->getSingleResult();
$this->assertTrue($child2 instanceof ChildEntity);
$this->assertEquals('thedata', $child2->getData());
$this->assertEquals(1234, $child2->getNumber());
$this->assertEquals($child->getId(), $child2->getId());
$this->assertFalse($child === $child2);
}
}