RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-06 17:17:10 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-416] Fixed.

Browse Source
This commit is contained in:
romanb 2010-03-18 11:40:43 +00:00
parent 91ac6fae3e
commit 76663a0501
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
View File

@ -398,7 +398,11 @@ class JoinedSubclassPersister extends StandardEntityPersister
$conditionSql = ''; $conditionSql = '';
foreach ($criteria as $field => $value) { foreach ($criteria as $field => $value) {
if ($conditionSql != '') $conditionSql .= ' AND '; if ($conditionSql != '') $conditionSql .= ' AND ';
$conditionSql .= $baseTableAlias . '.'; if (isset($this->_class->fieldMappings[$field]['inherited'])) {
$conditionSql .= $this->_getSQLTableAlias($this->_em->getClassMetadata($this->_class->fieldMappings[$field]['inherited'])) . '.';
} else {
$conditionSql .= $baseTableAlias . '.';
}
if (isset($this->_class->columnNames[$field])) { if (isset($this->_class->columnNames[$field])) {
$conditionSql .= $this->_class->getQuotedColumnName($field, $this->_platform); $conditionSql .= $this->_class->getQuotedColumnName($field, $this->_platform);
} else if ($assoc !== null) { } else if ($assoc !== null) {

6
tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php
View File

@ -71,6 +71,12 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->clear(); $this->_em->clear();
$guilherme = $this->_em->getRepository(get_class($employee))->findOneBy(array('name' => 'Guilherme Blanco'));
$this->assertTrue($guilherme instanceof CompanyEmployee);
$this->assertEquals('Guilherme Blanco', $guilherme->getName());
$this->_em->clear();
$query = $this->_em->createQuery("update Doctrine\Tests\Models\Company\CompanyEmployee p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3"); $query = $this->_em->createQuery("update Doctrine\Tests\Models\Company\CompanyEmployee p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3");
$query->setParameter(1, 'NewName'); $query->setParameter(1, 'NewName');
$query->setParameter(2, 'NewDepartment'); $query->setParameter(2, 'NewDepartment');