adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

forcing the db layer to make an WHERE field IS NULL when find statements are called with empty arrays, closes #4845

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7155 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
DarkAngelBGE 2008-06-10 16:17:44 +00:00
parent 3c518c182f
commit e221e9fb61
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -214,7 +214,7 @@ class DboMysql extends DboSource {
if ($parent != null) {
return $parent;
} elseif ($data === null) {
} elseif ($data === null || (is_array($data) && empty($data))) {
return 'NULL';
} elseif ($data === '') {
return "''";

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

@ -132,7 +132,7 @@ class DboSource extends DataSource {
* @return mixed Prepared value or array of values.
*/
function value($data, $column = null) {
if (is_array($data)) {
if (is_array($data) && !empty($data)) {
return array_map(array(&$this, 'value'), $data, array_fill(0, count($data), $column));
} elseif (is_object($data)) {
if (isset($data->type) && $data->type == 'identifier') {
@ -1833,7 +1833,7 @@ class DboSource extends DataSource {
}
if (
(is_array($value) && is_string($value[0]) && strpos($value[0], '-!') === 0) ||
(is_array($value) && !empty($value) && is_string($value[0]) && strpos($value[0], '-!') === 0) ||
(is_string($value) && strpos($value, '-!') === 0)
) {
trigger_error(__('Escape flag (-!) deprecated, use Model::query()', true), E_USER_WARNING);

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

@ -2350,6 +2350,14 @@ class DboSourceTest extends CakeTestCase {
$expected = " WHERE `score` IN (1, 2, 10)";
$this->assertEqual($result, $expected);
$result = $this->testDb->conditions(array('score' => array()));
$expected = " WHERE `score` IS NULL";
$this->assertEqual($result, $expected);
$result = $this->testDb->conditions(array('score !=' => array()));
$expected = " WHERE `score` IS NOT NULL";
$this->assertEqual($result, $expected);
$result = $this->testDb->conditions(array('score !=' => '20'));
$expected = " WHERE `score` != '20'";
$this->assertEqual($result, $expected);