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

Fixing case-sensitivity of AS in fields. Tests added. Fixes #1474

Browse source
This commit is contained in:
mark_story 2011-01-26 20:58:16 -05:00
parent d192ed32f0
commit 71d8e744f1
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -562,7 +562,7 @@ class DboSource extends DataSource {
); );
} }
if ( if (
preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+' . preg_quote($this->alias) . '\s*([\w-]+)$/', $data, $matches preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+' . preg_quote($this->alias) . '\s*([\w-]+)$/i', $data, $matches
)) { )) {
return $this->cacheMethod( return $this->cacheMethod(
__FUNCTION__, $cacheKey, __FUNCTION__, $cacheKey,

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

@ -4077,10 +4077,14 @@ class DboSourceTest extends CakeTestCase {
$result = $this->testDb->name(array('my-name', 'Foo-Model.*')); $result = $this->testDb->name(array('my-name', 'Foo-Model.*'));
$expected = array('`my-name`', '`Foo-Model`.*'); $expected = array('`my-name`', '`Foo-Model`.*');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = $this->testDb->name(array('Team.P%', 'Team.G/G')); $result = $this->testDb->name(array('Team.P%', 'Team.G/G'));
$expected = array('`Team`.`P%`', '`Team`.`G/G`'); $expected = array('`Team`.`P%`', '`Team`.`G/G`');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = $this->testDb->name('Model.name as y');
$expected = '`Model`.`name` AS `y`';
$this->assertEqual($result, $expected);
} }
/** /**