adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing fixtures.

Browse source 
Fixing setting of primaryKey when a model HABTM association is defined

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5614 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-09-03 04:48:58 +00:00
parent b574a98306
commit 77a9e3dd22
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cake/libs/model/model.php
View file

@ -721,16 +721,18 @@ class Model extends Overloadable {
$this->{$joinClass}->name = $joinClass;
$this->{$joinClass}->primaryKey = $this->{$type}[$assocKey]['foreignKey'];
if(count($this->{$joinClass}->_schema->value) > 2) {
if(isset($this->{$joinClass}->_schema->value['id'])) {
$this->{$joinClass}->primaryKey = 'id';
}
}
} else {
$this->__constructLinkedModel($joinClass);
$this->{$joinClass}->name = $joinClass;
$this->{$joinClass}->primaryKey = $this->{$type}[$assocKey]['foreignKey'];
$this->{$type}[$assocKey]['joinTable'] = $this->{$joinClass}->table;
}
if(count($this->{$joinClass}->_schema->value) > 2) {
if(isset($this->{$joinClass}->_schema->value['id'])) {
$this->{$joinClass}->primaryKey = 'id';
}
}
}
}
}

4
cake/tests/cases/libs/model/model.test.php
View file

@ -192,7 +192,7 @@ class Tag extends CakeTestModel {
* @subpackage cake.tests.cases.libs.model
*/
class ArticlesTag extends CakeTestModel {
var $name = 'ArticleTag';
var $name = 'ArticlesTag';
}
/**
* Short description for class.
@ -201,7 +201,7 @@ class ArticlesTag extends CakeTestModel {
* @subpackage cake.tests.cases.libs.model
*/
class ArticleFeaturedsTag extends CakeTestModel {
var $name = 'ArticleFeaturedTag';
var $name = 'ArticleFeaturedsTag';
}
/**
* Short description for class.