Adding a quite important missing part to join generation in BelonsTo and

HasOne
cakephp · May 12, 2013 · be991c6 · be991c6
1 parent 22c3ced
commit be991c6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/lib/Cake/ORM/Association/BelongsTo.php b/lib/Cake/ORM/Association/BelongsTo.php
@@ -74,7 +74,8 @@ public function attachTo(Query $query, array $options = []) {
 			'includeFields' => true,
 			'foreignKey' => $this->foreignKey(),
 			'conditions' => [],
-			'type' => $this->joinType()
+			'type' => $this->joinType(),
+			'table' => $target->table()
 		];
 		$options['conditions'] = array_merge($this->conditions(), $options['conditions']);
 

diff --git a/lib/Cake/ORM/Association/HasOne.php b/lib/Cake/ORM/Association/HasOne.php
@@ -82,7 +82,8 @@ public function attachTo(Query $query, array $options = []) {
 			'includeFields' => true,
 			'foreignKey' => $this->foreignKey(),
 			'conditions' => [],
-			'type' => $this->joinType()
+			'type' => $this->joinType(),
+			'table' => $target->table()
 		];
 		$options['conditions'] = array_merge($this->conditions(), $options['conditions']);
 

diff --git a/lib/Cake/Test/TestCase/ORM/Association/BelongsToTest.php b/lib/Cake/Test/TestCase/ORM/Association/BelongsToTest.php
@@ -87,6 +87,7 @@ public function testAttachTo() {
 					'Company.is_active' => true,
 					'Company.id = Client.company_id',
 				],
+				'table' => 'companies',
 				'type' => 'LEFT'
 			]
 		]);
@@ -115,7 +116,8 @@ public function testAttachToConfigOverride() {
 				'conditions' => [
 					'Company.is_active' => false
 				],
-				'type' => 'LEFT'
+				'type' => 'LEFT',
+				'table' => 'companies',
 			]
 		]);
 		$query->expects($this->once())->method('select')->with([
@@ -149,7 +151,8 @@ public function testAttachToNoFields() {
 					'Company.is_active' => true,
 					'Company.id = Client.company_id',
 				],
-				'type' => 'LEFT'
+				'type' => 'LEFT',
+				'table' => 'companies',
 			]
 		]);
 		$query->expects($this->never())->method('select');

diff --git a/lib/Cake/Test/TestCase/ORM/Association/HasOneTest.php b/lib/Cake/Test/TestCase/ORM/Association/HasOneTest.php
@@ -87,7 +87,8 @@ public function testAttachTo() {
 					'Profile.is_active' => true,
 					'User.id = Profile.user_id',
 				],
-				'type' => 'INNER'
+				'type' => 'INNER',
+				'table' => 'profiles'
 			]
 		]);
 		$query->expects($this->once())->method('select')->with([
@@ -117,7 +118,8 @@ public function testAttachToConfigOverride() {
 				'conditions' => [
 					'Profile.is_active' => false
 				],
-				'type' => 'INNER'
+				'type' => 'INNER',
+				'table' => 'profiles'
 			]
 		]);
 		$query->expects($this->once())->method('select')->with([
@@ -151,7 +153,8 @@ public function testAttachToNoFields() {
 					'Profile.is_active' => true,
 					'User.id = Profile.user_id',
 				],
-				'type' => 'INNER'
+				'type' => 'INNER',
+				'table' => 'profiles'
 			]
 		]);
 		$query->expects($this->never())->method('select');