DboMssql::value() now returns NULL for numeric column types (float, i…

…nteger, binary) when the column data is empty. Fixes #28.
cakephp · Sep 6, 2009 · 2484179 · 2484179
1 parent bcbdb1c
commit 2484179
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -259,6 +259,9 @@ function value($data, $column = null, $safe = false) {
 		if ($data === null) {
 			return 'NULL';
 		}
+		if (in_array($column, array('integer', 'float', 'binary')) && $data === '') {
+			return 'NULL';
+		}
 		if ($data === '') {
 			return "''";
 		}

diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -345,6 +345,18 @@ function testQuoting() {
 		$expected = "'1,2'";
 		$result = $this->db->value('1,2', 'float');
 		$this->assertIdentical($expected, $result);
+
+		$expected = 'NULL';
+		$result = $this->db->value('', 'integer');
+		$this->assertIdentical($expected, $result);
+
+		$expected = 'NULL';
+		$result = $this->db->value('', 'float');
+		$this->assertIdentical($expected, $result);
+
+		$expected = 'NULL';
+		$result = $this->db->value('', 'binary');
+		$this->assertIdentical($expected, $result);
 	}
 /**
  * testFields method