adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implementing automatic join models for HABTM associations, adding table prefix fix for Ticket #1965

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5522 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-08-14 23:12:24 +00:00
parent 214ad6346f
commit c3dc8cb827
2 changed files with 376 additions and 372 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -601,10 +601,6 @@ class Model extends Overloadable {
$className = $value['className'];
}
$this->__constructLinkedModel($assoc, $className);
if (isset($value['with']) && !empty($value['with'])) {
$this->__constructLinkedModel($value['with'], $value['with']);
}
}
$this->__generateAssociation($type);
}
@ -618,8 +614,11 @@ class Model extends Overloadable {
* @param string $ds Name of DataSource the model should be bound to
* @access private
*/
function __constructLinkedModel($assoc, $className, $id = false, $table = null, $ds = null) {
function __constructLinkedModel($assoc, $className = null, $id = false, $table = null, $ds = null) {
$colKey = Inflector::underscore($className);
if (empty($className)) {
$className = $assoc;
}
if (!class_exists($className)) {
if (!loadModel($className)) {
@ -694,14 +693,25 @@ class Model extends Overloadable {
if ($key == 'foreignKey' && !isset($this->keyToTable[$this->{$type}[$assocKey][$key]])) {
$this->keyToTable[$this->{$type}[$assocKey][$key]][0] = $this->{$class}->table;
$this->keyToTable[$this->{$type}[$assocKey][$key]][1] = $this->{$class}->name;
if ($this->{$class}->name != $class) {
$this->keyToTable[$this->{$type}[$assocKey][$key]][2] = $class;
}
}
}
if (isset($this->{$type}[$assocKey]['with'])) {
$with = $this->{$type}[$assocKey]['with'];
$this->__constructLinkedModel($with);
$this->{$type}[$assocKey]['joinTable'] = $this->{$with}->table;
} elseif ($type == 'hasAndBelongsToMany') {
$joinClass = Inflector::camelize($this->name . $assocKey);
$this->{$type}[$assocKey]['_with'] = $joinClass;
$this->{$joinClass} = new AppModel(array(
'name' => $joinClass,
'table' => $this->{$type}[$assocKey]['joinTable'],
'ds' => $this->useDbConfig
));
}
}
}
@ -967,8 +977,7 @@ class Model extends Overloadable {
$db =& ConnectionManager::getDataSource($this->useDbConfig);
$this->set($data);
$whitelist = !(empty($fieldList) || count($fieldList) == 0);
$whitelist = !empty($fieldList);
if ($validate && !$this->validates()) {
return false;
@ -1883,10 +1892,9 @@ class Model extends Overloadable {
if ($dataSource != null) {
$this->useDbConfig = $dataSource;
}
$db =& ConnectionManager::getDataSource($this->useDbConfig);
if (!empty($db->config['prefix']) && $this->tablePrefix == null) {
if (!empty($db->config['prefix']) && $this->tablePrefix !== false) {
$this->tablePrefix = $db->config['prefix'];
}

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

@ -308,7 +308,7 @@ class Author extends CakeTestModel {
class ModelTest extends CakeTestCase {
var $fixtures = array(
'core.category', 'core.category_thread', 'core.user', 'core.article', 'core.featured',
'core.category', 'core.category_thread', 'core.user', 'core.article', 'core.featured', 'core.article_featureds_tags',
'core.article_featured', 'core.tag', 'core.articles_tag', 'core.comment', 'core.attachment',
'core.apple', 'core.sample', 'core.another_article', 'core.advertisement', 'core.home', 'core.post', 'core.author'
);
@ -1744,9 +1744,7 @@ function testRecursiveFindAllWithLimit() {
$data = array(
'Article' => array('id' => '2', 'title' => 'New Second Article'),
'Tag' => array(
'Tag' => array( 1, 2 )
)
'Tag' => array('Tag' => array(1, 2))
);
$result = $this->model->set($data);
@ -2221,9 +2219,7 @@ function testRecursiveFindAllWithLimit() {
$result = $this->model->findNeighbours(null, 'Article.id', '3');
$expected = array(
'prev' => array(
'Article' => array('id' => 2)
),
'prev' => array('Article' => array('id' => 2)),
'next' => array()
);
$this->assertEqual($result, $expected);