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

Merge pull request #1620 from ovidiupruteanu/patch-1

Browse source 
Fixed handling null values in Sqlserver->value().

Fixes #3768
This commit is contained in:
Mark Story 2013-09-09 09:20:05 -07:00
commit 1499723252
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Datasource/Database/Sqlserver.php
View file

@ -571,7 +571,7 @@ class Sqlserver extends DboSource {
* @return string Quoted and escaped data * @return string Quoted and escaped data
*/ */
public function value($data, $column = null) { public function value($data, $column = null) {
if (is_array($data) || is_object($data)) { if ($data === null || is_array($data) || is_object($data)) {
return parent::value($data, $column); return parent::value($data, $column);
} elseif (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) { } elseif (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) {
return $data; return $data;

4
lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
View file

@ -311,6 +311,10 @@ class SqlserverTest extends CakeTestCase {
$expected = "''"; $expected = "''";
$result = $this->db->value('', 'binary'); $result = $this->db->value('', 'binary');
$this->assertSame($expected, $result); $this->assertSame($expected, $result);
$expected = 'NULL';
$result = $this->db->value(null, 'string');
$this->assertSame($expected, $result);
} }
/** /**