Merge branch 'master' of git://github.com/jpfuentes2/php-activerecord into 1.1-dev

Author: cvanschalkwijk

lib/Model.php

@@ -1722,6 +1722,11 @@ protected static function get_models_from_cache(array $pks)
 	 */
 	public static function find_by_pk($values, $options)
 	{
+		if($values===null)
+		{
+			throw new RecordNotFound("Couldn't find ".get_called_class()." without an ID");
+		}
+
 		$table = static::table();
 
 		if($table->cache_individual_model)
@@ -1739,16 +1744,14 @@ public static function find_by_pk($values, $options)
 		if ($results != ($expected = count($values)))
 		{
 			$class = get_called_class();
+			if (is_array($values))
+				$values = join(',',$values);
 
 			if ($expected == 1)
 			{
-				if (!is_array($values))
-					$values = array($values);
-
-				throw new RecordNotFound("Couldn't find $class with ID=" . join(',',$values));
+				throw new RecordNotFound("Couldn't find $class with ID=$values");
 			}
 
-			$values = join(',',$values);
 			throw new RecordNotFound("Couldn't find all $class with IDs ($values) (found $results, but was looking for $expected)");
 		}
 		return $expected == 1 ? $list[0] : $list;

lib/Serialization.php

@@ -176,7 +176,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/ActiveRecordFindTest.php

@@ -445,6 +445,14 @@ public function test_find_by_zero()
 		Author::find(0);
 	}
 
+	/**
+	 * @expectedException ActiveRecord\RecordNotFound
+	 */
+	public function test_find_by_null()
+	{
+		Author::find(null);
+	}
+
 	public function test_count_by()
 	{
 		$this->assert_equals(2,Venue::count_by_state('VA'));
@@ -460,11 +468,6 @@ public function test_find_by_pk_should_not_use_limit()
 
 	public function test_find_by_datetime()
 	{
-		if ( getenv('TRAVIS') ) $this->markTestSkipped(
-			'The Travis CI environment seems to screw this up for unknonwn reasons; ' .
-			'see Github #298 (https://github.com/kla/php-activerecord/issues/298)'
-		);
-
 		$now = new DateTime();
 		$arnow = new ActiveRecord\DateTime();
 		$arnow->setTimestamp($now->getTimestamp());

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),