Checking for null values before converting to boolean

cakephp · Jan 4, 2011 · 665e560 · 665e560
1 parent de6eda9
commit 665e560
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -238,7 +238,7 @@ function fetchResult() {
 			foreach ($this->map as $col => $meta) {
 				list($table, $column, $type) = $meta;
 				$resultRow[$table][$column] = $row[$col];
-				if ($type == 'boolean') {
+				if ($type == 'boolean' && !is_null($row[$col])) {
 					$resultRow[$table][$column] = $this->boolean($resultRow[$table][$column]);
 				}
 			}

diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -707,7 +707,7 @@ function fetchResult() {
 
 				switch ($type) {
 					case 'bool':
-						$resultRow[$table][$column] = $this->boolean($row[$index]);
+						$resultRow[$table][$column] = is_null($row[$index]) ? null : $this->boolean($row[$index]);
 					break;
 					case 'binary':
 					case 'bytea':

diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -336,7 +336,7 @@ function fetchResult() {
 			foreach ($this->map as $col => $meta) {
 				list($table, $column, $tpye) = $meta;
 				$resultRow[$table][$column] = $row[$col];
-				if ($type === 'boolean') {
+				if ($type == 'boolean' && !is_null($row[$col])) {
 					$resultRow[$table][$column] = $this->boolean($resultRow[$table][$column]);
 				}
 			}