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

minor relation fix

Browse source
This commit is contained in:
zYne 2007-07-08 19:19:53 +00:00
parent 532d3da4f1
commit 84f764cf56
2 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Doctrine/Relation/Parser.php
View file

@ -212,6 +212,7 @@ class Doctrine_Relation_Parser
$def = $this->completeDefinition($def); $def = $this->completeDefinition($def);
if (isset($def['localKey'])) { if (isset($def['localKey'])) {
$rel = new Doctrine_Relation_LocalKey($def); $rel = new Doctrine_Relation_LocalKey($def);
} else { } else {
$rel = new Doctrine_Relation_ForeignKey($def); $rel = new Doctrine_Relation_ForeignKey($def);
@ -382,7 +383,8 @@ class Doctrine_Relation_Parser
$def['localKey'] = true; $def['localKey'] = true;
} }
} else { } else {
if ($def['local'] !== $this->_table->getIdentifier()) { if ($def['local'] !== $this->_table->getIdentifier() &&
$def['type'] == Doctrine_Relation::ONE) {
$def['localKey'] = true; $def['localKey'] = true;
} }
} }

46
tests/Relation/OneToManyTestCase.php
View file

@ -34,27 +34,37 @@ class Doctrine_Relation_OneToMany_TestCase extends Doctrine_UnitTestCase
{ {
public function prepareData() public function prepareData()
{ } { }
public function testRelationParsing() public function testRelationParsing()
{ {
$table = $this->conn->getTable('Entity'); $table = $this->conn->getTable('Entity');
$rel = $table->getRelation('Phonenumber'); $rel = $table->getRelation('Phonenumber');
$this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey); $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
$rel = $table->getRelation('Email'); $rel = $table->getRelation('Email');
$this->assertTrue($rel instanceof Doctrine_Relation_LocalKey); $this->assertTrue($rel instanceof Doctrine_Relation_LocalKey);
} }
public function testRelationParsing2() public function testRelationParsing2()
{ {
$table = $this->conn->getTable('Phonenumber'); $table = $this->conn->getTable('Phonenumber');
$rel = $table->getRelation('Entity'); $rel = $table->getRelation('Entity');
$this->assertTrue($rel instanceof Doctrine_Relation_LocalKey); $this->assertTrue($rel instanceof Doctrine_Relation_LocalKey);
} }
public function testRelationParsing3()
{
$table = $this->conn->getTable('Policy');
$rel = $table->getRelation('PolicyAssets');
$this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
}
public function testRelationSaving() public function testRelationSaving()
{ {
$e = new Entity(); $e = new Entity();
@ -67,3 +77,33 @@ class Doctrine_Relation_OneToMany_TestCase extends Doctrine_UnitTestCase
$nr->Entity = $e; $nr->Entity = $e;
} }
} }
class Policy extends Doctrine_Record
{
public function setTableDefinition(){
$this->setTableName('policies');
$this->hasColumn('policy_number', 'integer', 11, array('unique' => true));
}
public function setUp()
{
$this->hasMany('PolicyAsset as PolicyAssets', array('local' => 'policy_number',
'foreign' => 'policy_number'));
$this->index('policy_number_index', array('fields' => 'policy_number'));
}
}
class PolicyAsset extends Doctrine_Record
{
public function setTableDefinition()
{
$this->setTableName('policy_assets');
$this->hasColumn('policy_number', 'integer', 11);
$this->hasColumn('value', 'float', 10, array ('notblank' => true,));
}
public function setUp(){
$this->hasOne('Policy', array('foreign' => 'policy_number',
'local' => 'policy_number'));
$this->index('policy_number_index', array('fields' => 'policy_number'));
$this->index('vehicle_code_index', array('fields' => 'vehicle_code'));
}
}