Merge pull request #436 from jpfuentes2/jmoberley-issue_68

relationship references wrong table

Author: koenpunt

lib/Relationship.php

@@ -496,7 +496,7 @@ public function load(Model $model)
 			if ($this->through)
 			{
 				// verify through is a belongs_to or has_many for access of keys
-				if (!($through_relationship = $this->get_table()->get_relationship($this->through)))
+				if (!($through_relationship = $model->table()->get_relationship($this->through)))
 					throw new HasManyThroughAssociationException("Could not find the association $this->through in model " . get_class($model));
 
 				if (!($through_relationship instanceof HasMany) && !($through_relationship instanceof BelongsTo))
@@ -508,8 +508,7 @@ public function load(Model $model)
 
 				$this->set_keys($this->get_table()->class->getName(), true);
 
-				$class = $this->class_name;
-				$relation = $class::table()->get_relationship($this->through);
+				$relation = $model::table()->get_relationship($this->through);
 				$through_table = $relation->get_table();
 				$this->options['joins'] = $this->construct_inner_join_sql($through_table, true);
 

test/HasManyThroughTest.php

@@ -55,4 +55,41 @@ public function test_gh107_has_many_though_include_eager_with_namespace()
 		$this->assert_equals(1, $user->id);
 		$this->assert_equals(1, $user->newsletters[0]->id);
 	}
+
+	public function test_gh68_has_many_through_with_missing_associations()
+	{
+		Property::$has_many = array(
+			array('amenities', 'through' => 'property_amenities')
+		);
+		Amenity::$has_many = array(
+			array('properties', 'through' => 'property_amenities')
+		);
+
+		$property = Property::find('first');
+		try{
+			$property->amenities;
+			$this->fail('Should trigger exception');
+		}catch(ActiveRecord\HasManyThroughAssociationException $e){
+			$this->assertEquals('Could not find the association property_amenities in model Property', $e->getMessage());
+		}
+	}
+
+	public function test_gh68_has_many_through_with_missing_association()
+	{
+		Property::$has_many = array(
+			'property_amenities',
+			array('amenities', 'through' => 'property_amenities')
+		);
+		Amenity::$has_many = array(
+			array('properties', 'through' => 'property_amenities')
+		);
+
+		$amenity = Amenity::find('first');
+		try{
+			$amenity->properties;
+			$this->fail('Should trigger exception');
+		}catch(ActiveRecord\HasManyThroughAssociationException $e){
+			$this->assertEquals('Could not find the association property_amenities in model Amenity', $e->getMessage());
+		}
+	}
 }

test/RelationshipTest.php

@@ -341,6 +341,14 @@ public function test_has_many_through()
 
 	public function test_gh27_has_many_through_with_explicit_keys()
 	{
+		Property::$has_many = array(
+			'property_amenities',
+			array('amenities', 'through' => 'property_amenities')
+		);
+		Amenity::$has_many = array(
+			'property_amenities'
+		);
+		
 		$property = Property::first();
 
 		$this->assert_equals(1, $property->amenities[0]->amenity_id);