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 pull request #962 from srwebs/feature/empty-bool-operators

Browse source 
Fix: check if bool operators in find conditions are empty.
This commit is contained in:
Mark Story 2012-11-24 10:14:22 -08:00
commit 780b6f01b4
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Model/Datasource/DboSource.php
View file

@ -2465,6 +2465,10 @@ class DboSource extends DataSource {
$not = 'NOT '; $not = 'NOT ';
} }
if (empty($value)) {
continue;
}
if (empty($value[1])) { if (empty($value[1])) {
if ($not) { if ($not) {
$out[] = $not . '(' . $value[0] . ')'; $out[] = $not . '(' . $value[0] . ')';

13
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
View file

@ -159,6 +159,19 @@ class DboSourceTest extends CakeTestCase {
$this->assertEquals(' WHERE 1 = 1', $result); $this->assertEquals(' WHERE 1 = 1', $result);
} }
/**
* test that booleans work on empty set.
*
* @return void
*/
public function testBooleanEmptyConditionsParsing() {
$result = $this->testDb->conditions(array('OR' => array()));
$this->assertEquals(' WHERE 1 = 1', $result, 'empty conditions failed');
$result = $this->testDb->conditions(array('OR' => array('OR' => array())));
$this->assertEquals(' WHERE 1 = 1', $result, 'nested empty conditions failed');
}
/** /**
* test that order() will accept objects made from DboSource::expression * test that order() will accept objects made from DboSource::expression
* *