Fix null bytea columns.

Apply patch from 'opiazer' Fixes #2432
cakephp · Jan 4, 2012 · c43b099 · c43b099
1 parent 101148c
commit c43b099
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php
@@ -716,7 +716,7 @@ public function fetchResult() {
 					break;
 					case 'binary':
 					case 'bytea':
-						$resultRow[$table][$column] = stream_get_contents($row[$index]);
+						$resultRow[$table][$column] = is_null($row[$index]) ? null : stream_get_contents($row[$index]);
 					break;
 					default:
 						$resultRow[$table][$column] = $row[$index];

diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
@@ -759,7 +759,7 @@ public function testVirtualFields() {
  */
 	function testVirtualFieldAsAConstant() {
 		$this->loadFixtures('Article', 'Comment');
-		$Article =& ClassRegistry::init('Article');
+		$Article = ClassRegistry::init('Article');
 		$Article->virtualFields = array(
 			'empty' => "NULL",
 			'number' => 43,