Merge pull request #477 from lfglopes/bugfix/serializer

When a foriegn key is NULL and it's value is mapped with belongs_to, serialization breaks

Author: cvanschalkwijk

lib/Serialization.php

@@ -173,7 +173,11 @@ private function check_include()
 				try {
 					$assoc = $this->model->$association;
 
-					if (!is_array($assoc))
+					if ($assoc === null)
+					{
+						$this->attributes[$association] = null;
+					}
+					elseif (!is_array($assoc))
 					{
 						$serialized = new $serializer_class($assoc, $options);
 						$this->attributes[$association] = $serialized->to_a();;

test/RelationshipTest.php

@@ -133,6 +133,12 @@ public function test_belongs_to_returns_null_when_no_record()
 		$this->assert_null($event->venue);
 	}
 
+	public function test_belongs_to_returns_null_when_foreign_key_is_null()
+	{
+		$event = Event::create(array('title' => 'venueless event'));
+		$this->assert_null($event->venue);
+	}
+
 	public function test_belongs_to_with_explicit_class_name()
 	{
 		Event::$belongs_to = array(array('explicit_class_name', 'class_name' => 'Venue'));

test/sql/mysql.sql

@@ -38,7 +38,7 @@ CREATE TABLE venues (
 
 CREATE TABLE events (
 	id int NOT NULL auto_increment PRIMARY KEY,
-	venue_id int NOT NULL,
+	venue_id int NULL,
 	host_id int NOT NULL,
 	title varchar(60) NOT NULL,
 	description varchar(50),

test/sql/oci.sql

@@ -41,7 +41,7 @@ CREATE TABLE venues (
 CREATE SEQUENCE events_seq;
 CREATE TABLE events (
   id INT NOT NULL PRIMARY KEY,
-  venue_id int NOT NULL,
+  venue_id int NULL,
   host_id int NOT NULL,
   title varchar(60) NOT NULL,
   description varchar(10),

test/sql/pgsql.sql

@@ -37,7 +37,7 @@ CREATE TABLE venues (
 
 CREATE TABLE events (
 	id SERIAL PRIMARY KEY,
-	venue_id int NOT NULL,
+	venue_id int NULL,
 	host_id int NOT NULL,
 	title varchar(60) NOT NULL,
 	description varchar(10),

test/sql/sqlite.sql

@@ -37,7 +37,7 @@ CREATE TABLE venues (
 
 CREATE TABLE events (
   id INTEGER NOT NULL PRIMARY KEY,
-  venue_id int NOT NULL,
+  venue_id int NULL,
   host_id int NOT NULL,
   title varchar(60) NOT NULL,
   description varchar(10),