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

ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709

Browse source
This commit is contained in:
Ceeram 2012-04-02 18:46:30 +02:00
parent 4e67698506
commit 34a730dfd8
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Model/Datasource/DboSource.php
View file

@ -1651,7 +1651,8 @@ class DboSource extends DataSource {
$data['conditions'] = trim($this->conditions($data['conditions'], true, false)); $data['conditions'] = trim($this->conditions($data['conditions'], true, false));
} }
if (!empty($data['table'])) { if (!empty($data['table'])) {
$data['table'] = $this->fullTableName($data['table']); $schema = !(is_string($data['table']) && strpos($data['table'], '(') === 0);
$data['table'] = $this->fullTableName($data['table'], true, $schema);
} }
return $this->renderJoinStatement($data); return $this->renderJoinStatement($data);
} }

38
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
View file

@ -836,4 +836,42 @@ class DboSourceTest extends CakeTestCase {
$log = $db->getLog(); $log = $db->getLog();
$this->assertEquals($expected, $log['log'][0]); $this->assertEquals($expected, $log['log'][0]);
} }
/**
* data provider for testBuildJoinStatement
*
* @return array
*/
public static function joinStatements($schema) {
return array(
array(array(
'type' => 'LEFT',
'alias' => 'PostsTag',
'table' => 'posts_tags',
'conditions' => array('PostsTag.post_id = Post.id')
), 'LEFT JOIN cakephp.posts_tags AS PostsTag ON (PostsTag.post_id = Post.id)'),
array(array(
'type' => 'LEFT',
'alias' => 'Stock',
'table' => '(SELECT Stock.article_id, sum(quantite) quantite FROM stocks AS Stock GROUP BY Stock.article_id)',
'conditions' => 'Stock.article_id = Article.id'
), 'LEFT JOIN (SELECT Stock.article_id, sum(quantite) quantite FROM stocks AS Stock GROUP BY Stock.article_id) AS Stock ON (Stock.article_id = Article.id)')
);
}
/**
* Test buildJoinStatement()
* ensure that schemaName is not added when table value is a subquery
*
* @dataProvider joinStatements
* @return void
*/
public function testBuildJoinStatement($join, $expected) {
$db = $this->getMock('DboTestSource', array('getSchemaName'));
$db->expects($this->any())
->method('getSchemaName')
->will($this->returnValue('cakephp'));
$result = $db->buildJoinStatement($join);
$this->assertEquals($expected, $result);
}
} }