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

Adding SQL function quoting fix in DboSource (Ticket #2987)

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5472 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-07-29 12:21:41 +00:00
parent d6c4229d81
commit ad53804b60
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -370,10 +370,14 @@ class DboSource extends DataSource {
* @return string SQL field * @return string SQL field
*/ */
function name($data) { function name($data) {
if (preg_match_all('/(.*)\((.*)\)(.*)/', $data, $fields)) { if (preg_match_all('/([^(]*)\((.*)\)(.*)/', $data, $fields)) {
$fields = Set::extract($fields, '{n}.0'); $fields = Set::extract($fields, '{n}.0');
if (isset($fields[1]) && isset($fields[2])) { if (!empty($fields[1])) {
if (!empty($fields[2])) {
return $fields[1] . '(' . $this->name($fields[2]) . ')' . $fields[3]; return $fields[1] . '(' . $this->name($fields[2]) . ')' . $fields[3];
} else {
return $fields[1] . '()' . $fields[3];
}
} }
} }
if ($data == '*') { if ($data == '*') {

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

@ -1631,6 +1631,7 @@ class DboSourceTest extends UnitTestCase {
$result = $this->db->conditions($conditions); $result = $this->db->conditions($conditions);
$this->assertPattern('/^\s*WHERE\s+`Thread`.`project_id`\s*=\s*5\s+AND\s+`Thread`.`buyer_id`\s*=\s*14\s+AND\s+1\s*=\s*1\s+GROUP BY `Thread`.`project_id`$/', $result); $this->assertPattern('/^\s*WHERE\s+`Thread`.`project_id`\s*=\s*5\s+AND\s+`Thread`.`buyer_id`\s*=\s*14\s+AND\s+1\s*=\s*1\s+GROUP BY `Thread`.`project_id`$/', $result);
} }
function testFieldParsing() { function testFieldParsing() {
$result = $this->db->fields($this->model, 'Vendor', "Vendor.id, COUNT(Model.vendor_id) AS `Vendor`.`count`"); $result = $this->db->fields($this->model, 'Vendor', "Vendor.id, COUNT(Model.vendor_id) AS `Vendor`.`count`");
$expected = array('`Vendor`.`id`', 'COUNT(`Model`.`vendor_id`) AS `Vendor`.`count`'); $expected = array('`Vendor`.`id`', 'COUNT(`Model`.`vendor_id`) AS `Vendor`.`count`');
@ -1707,6 +1708,10 @@ class DboSourceTest extends UnitTestCase {
$result = $this->db->fields($this->model, null, 'field1, field2, field3, count(*), name'); $result = $this->db->fields($this->model, null, 'field1, field2, field3, count(*), name');
$expected = array('`TestModel`.`field1`', '`TestModel`.`field2`', '`TestModel`.`field3`', 'count(*)', '`TestModel`.`name`'); $expected = array('`TestModel`.`field1`', '`TestModel`.`field2`', '`TestModel`.`field3`', 'count(*)', '`TestModel`.`name`');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = $this->db->fields($this->model, null, array('dayofyear(now())'));
$expected = array('dayofyear(now())');
$this->assertEqual($result, $expected);
} }
function testMergeAssociations() { function testMergeAssociations() {