Ability to set the table name for the join table

cakephp · May 26, 2013 · 9c61c65 · 9c61c65
1 parent 8ec20f8
commit 9c61c65
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/Cake/ORM/Association/BelongsToMany.php b/lib/Cake/ORM/Association/BelongsToMany.php
@@ -217,14 +217,15 @@ protected function _buildQuery($options) {
  */
 	protected function _joinTableName($name = null) {
 		if ($name === null) {
-			if (empty($this->_joinTableName)) {
+			if (empty($this->_joinTable)) {
 				$aliases = array_map('\Cake\Utility\Inflector::tableize', [
 					$sAlias = $this->source()->alias(),
 					$tAlias = $this->target()->alias()
 				]);
 				sort($aliases);
-				$name = implode('_', $aliases);
+				$this->_joinTable = implode('_', $aliases);
 			}
+			return $this->_joinTable;
 		}
 		return $this->_joinTable = $name;
 	}

diff --git a/lib/Cake/Test/TestCase/ORM/Association/BelongsToManyTest.php b/lib/Cake/Test/TestCase/ORM/Association/BelongsToManyTest.php
@@ -128,4 +128,21 @@ public function testPivot() {
 		$assoc->pivot('ArticleTag');
 		$this->assertSame($pivot, $assoc->pivot());
 	}
+
+/**
+ * Tests it is possible to set the table name for the join table
+ *
+ * @return void
+ */
+	public function testPivotWithDefaultTableName() {
+		$assoc = new BelongsToMany('Test', [
+			'sourceTable' => $this->article,
+			'targetTable' => $this->tag,
+			'joinTable' => 'tags_articles'
+		]);
+		$pivot = $assoc->pivot();
+		$this->assertEquals('ArticleTag', $pivot->alias());
+		$this->assertEquals('tags_articles', $pivot->table());
+	}
+
 }