Refactoring canBeJoined so it is more dynamic

cakephp · Mar 31, 2014 · beef973 · beef973
1 parent 7fd9bbf
commit beef973
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/src/ORM/Association.php b/src/ORM/Association.php
@@ -79,13 +79,6 @@ abstract class Association {
  */
 	protected $_name;
 
-/**
- * Whether this association can be expressed directly in a query join
- *
- * @var boolean
- */
-	protected $_canBeJoined = false;
-
 /**
  * The class name of the target table object
  *
@@ -302,7 +295,8 @@ public function dependent($dependent = null) {
  * @return boolean
  */
 	public function canBeJoined($options = []) {
-		return $this->_canBeJoined;
+		$strategy = isset($options['strategy']) ? $options['strategy'] : $this->strategy();
+		return $strategy == $this::STRATEGY_JOIN;
 	}
 
 /**

diff --git a/src/ORM/Association/BelongsTo.php b/src/ORM/Association/BelongsTo.php
@@ -28,13 +28,6 @@
  */
 class BelongsTo extends Association {
 
-/**
- * Whether this association can be expressed directly in a query join
- *
- * @var boolean
- */
-	protected $_canBeJoined = true;
-
 /**
  * Sets the name of the field representing the foreign key to the target table.
  * If no parameters are passed current field is returned

diff --git a/src/ORM/Association/HasOne.php b/src/ORM/Association/HasOne.php
@@ -31,13 +31,6 @@ class HasOne extends Association {
 
 	use DependentDeleteTrait;
 
-/**
- * Whether this association can be expressed directly in a query join
- *
- * @var boolean
- */
-	protected $_canBeJoined = true;
-
 /**
  * The type of join to be used when adding the association to a query
  *

diff --git a/tests/TestCase/ORM/AssociationTest.php b/tests/TestCase/ORM/AssociationTest.php
@@ -117,7 +117,7 @@ public function testConditions() {
  * @return void
  */
 	public function testCanBeJoined() {
-		$this->assertFalse($this->association->canBeJoined());
+		$this->assertTrue($this->association->canBeJoined());
 	}
 
 /**