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

Applying patch from 'farhadi' correcting regular expression when using magic findBy and fields that contain findBy in them. Fixes #6138

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8057 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mark_story 2009-02-25 03:22:31 +00:00
parent 779b367d3b
commit 2a139b171c
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,10 +225,10 @@ class DboSource extends DataSource {
if (strpos(strtolower($args[0]), 'findby') === 0) { if (strpos(strtolower($args[0]), 'findby') === 0) {
$all = false; $all = false;
$field = Inflector::underscore(preg_replace('/findBy/i', '', $args[0])); $field = Inflector::underscore(preg_replace('/^findBy/i', '', $args[0]));
} else { } else {
$all = true; $all = true;
$field = Inflector::underscore(preg_replace('/findAllBy/i', '', $args[0])); $field = Inflector::underscore(preg_replace('/^findAllBy/i', '', $args[0]));
} }
$or = (strpos($field, '_or_') !== false); $or = (strpos($field, '_or_') !== false);

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

@ -3107,6 +3107,13 @@ class DboSourceTest extends CakeTestCase {
)); ));
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = $this->testDb->query('findByFindBy', array('value'), $this->Model);
$expected = array('first', array(
'conditions' => array('TestModel.find_by' => 'value'),
'fields' => null, 'order' => null, 'recursive' => null
));
$this->assertEqual($result, $expected);
$result = $this->testDb->query('findAllByFieldName', array('value'), $this->Model); $result = $this->testDb->query('findAllByFieldName', array('value'), $this->Model);
$expected = array('all', array( $expected = array('all', array(
'conditions' => array('TestModel.field_name' => 'value'), 'conditions' => array('TestModel.field_name' => 'value'),