adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding DboSource fix for SELECT DISTINCT, fixes #4101

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6472 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-02-24 03:15:37 +00:00
parent 3140144a1f
commit c1251c8265
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cake/libs/model/datasources/dbo_source.php
View file

@ -1595,20 +1595,20 @@ class DboSource extends DataSource {
$prepend = ''; $prepend = '';
if (strpos($fields[$i], 'DISTINCT') !== false) { if (strpos($fields[$i], 'DISTINCT') !== false) {
$prepend = 'DISTINCT '; $prepend = 'DISTINCT ';
$fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i])); $fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i]));
} }
$dot = strpos($fields[$i], '.'); $dot = strpos($fields[$i], '.');
if ($dot === false) { if ($dot === false) {
$fields[$i] = $prepend . $this->name($alias . '.' . $fields[$i]); $fields[$i] = $this->name($alias . '.' . $fields[$i]);
} else { } else {
$value = array(); $value = array();
$comma = strpos($fields[$i], ','); $comma = strpos($fields[$i], ',');
if ($comma === false) { if ($comma === false) {
$build = explode('.', $fields[$i]); $build = explode('.', $fields[$i]);
if (!Set::numeric($build)) { if (!Set::numeric($build)) {
$fields[$i] = $prepend . $this->name($build[0] . '.' . $build[1]); $fields[$i] = $this->name($build[0] . '.' . $build[1]);
} }
$comma = String::tokenize($fields[$i]); $comma = String::tokenize($fields[$i]);
foreach ($comma as $string) { foreach ($comma as $string) {
@ -1616,12 +1616,13 @@ class DboSource extends DataSource {
$value[] = $string; $value[] = $string;
} else { } else {
$build = explode('.', $string); $build = explode('.', $string);
$value[] = $prepend . $this->name(trim($build[0]) . '.' . trim($build[1])); $value[] = $this->name(trim($build[0]) . '.' . trim($build[1]));
} }
} }
$fields[$i] = implode(', ', $value); $fields[$i] = implode(', ', $value);
} }
} }
$fields[$i] = $prepend . $fields[$i];
} elseif (preg_match('/\(([\.\w]+)\)/', $fields[$i], $field)) { } elseif (preg_match('/\(([\.\w]+)\)/', $fields[$i], $field)) {
if (isset($field[1])) { if (isset($field[1])) {
if (strpos($field[1], '.') === false) { if (strpos($field[1], '.') === false) {

6
cake/tests/cases/libs/model/datasources/dbo_source.test.php
View file

@ -1326,6 +1326,12 @@ class DboSourceTest extends CakeTestCase {
return $result; return $result;
} }
function testSelectDistict() {
$result = $this->db->fields($this->Model, 'Vendor', "DISTINCT Vendor.id, Vendor.name");
$expected = array('DISTINCT `Vendor`.`id`', '`Vendor`.`name`');
$this->assertEqual($result, $expected);
}
function testStringConditionsParsing() { function testStringConditionsParsing() {
$result = $this->db->conditions("ProjectBid.project_id = Project.id"); $result = $this->db->conditions("ProjectBid.project_id = Project.id");
$expected = " WHERE `ProjectBid`.`project_id` = `Project`.`id`"; $expected = " WHERE `ProjectBid`.`project_id` = `Project`.`id`";