adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-18 23:49:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3

Browse source
This commit is contained in:
Mark Story 2010-04-08 00:04:14 -04:00
commit 4d780ee1f3
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/datasources/dbo/dbo_postgres.php
View file

@ -493,7 +493,7 @@ class DboPostgres extends DboSource {
$match[1] = trim(str_replace('DISTINCT', '', $match[1])); $match[1] = trim(str_replace('DISTINCT', '', $match[1]));
} }
if (strpos($match[1], '.') === false) { if (strpos($match[1], '.') === false) {
$match[1] = $this->name($alias . '.' . $match[1]); $match[1] = $this->name($match[1]);
} else { } else {
$parts = explode('.', $match[1]); $parts = explode('.', $match[1]);
if (!Set::numeric($parts)) { if (!Set::numeric($parts)) {

8
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
View file

@ -795,6 +795,14 @@ class DboPostgresTest extends CakeTestCase {
$result = $this->db->fields($Article, null, array('COUNT(DISTINCT Article.id)')); $result = $this->db->fields($Article, null, array('COUNT(DISTINCT Article.id)'));
$expected = array('COUNT(DISTINCT "Article"."id")'); $expected = array('COUNT(DISTINCT "Article"."id")');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = $this->db->fields($Article, null, array('COUNT(DISTINCT id)'));
$expected = array('COUNT(DISTINCT "id")');
$this->assertEqual($result, $expected);
$result = $this->db->fields($Article, null, array('COUNT(DISTINCT FUNC(id))'));
$expected = array('COUNT(DISTINCT FUNC("id"))');
$this->assertEqual($result, $expected);
} }
} }
?> ?>