Used ConventionsTrait::_modelKey() to create FKs

cakephp · Sep 12, 2014 · 15cc486 · 15cc486
1 parent ab24722
commit 15cc486
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/src/ORM/Association.php b/src/ORM/Association.php
@@ -14,6 +14,7 @@
  */
 namespace Cake\ORM;
 
+use Cake\Core\ConventionsTrait;
 use Cake\Database\Expression\IdentifierExpression;
 use Cake\Datasource\ResultSetDecorator;
 use Cake\Event\Event;
@@ -30,6 +31,8 @@
  */
 abstract class Association {
 
+	use ConventionsTrait;
+
 /**
  * Strategy name to use joins for fetching associated records
  *

diff --git a/src/ORM/Association/BelongsTo.php b/src/ORM/Association/BelongsTo.php
@@ -41,8 +41,7 @@ class BelongsTo extends Association {
 	public function foreignKey($key = null) {
 		if ($key === null) {
 			if ($this->_foreignKey === null) {
-				$key = Inflector::singularize($this->target()->alias());
-				$this->_foreignKey = Inflector::underscore($key) . '_id';
+				$this->_foreignKey = $this->_modelKey($this->target()->alias());
 			}
 			return $this->_foreignKey;
 		}

diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php
@@ -123,8 +123,7 @@ class BelongsToMany extends Association {
 	public function targetForeignKey($key = null) {
 		if ($key === null) {
 			if ($this->_targetForeignKey === null) {
-				$key = Inflector::singularize($this->target()->alias());
-				$this->_targetForeignKey = Inflector::underscore($key) . '_id';
+				$this->_targetForeignKey = $this->_modelKey($this->target()->alias());
 			}
 			return $this->_targetForeignKey;
 		}

diff --git a/src/ORM/Association/ExternalAssociationTrait.php b/src/ORM/Association/ExternalAssociationTrait.php
@@ -15,7 +15,6 @@
 namespace Cake\ORM\Association;
 
 use Cake\ORM\Association\SelectableAssociationTrait;
-use Cake\Utility\Inflector;
 
 /**
  * Represents a type of association that that needs to be recovered by performing
@@ -55,8 +54,7 @@ public function canBeJoined(array $options = []) {
 	public function foreignKey($key = null) {
 		if ($key === null) {
 			if ($this->_foreignKey === null) {
-				$key = Inflector::singularize($this->source()->alias());
-				$this->_foreignKey = Inflector::underscore($key) . '_id';
+				$this->_foreignKey = $this->_modelKey($this->source()->alias());
 			}
 			return $this->_foreignKey;
 		}

diff --git a/src/ORM/Association/HasOne.php b/src/ORM/Association/HasOne.php
@@ -42,8 +42,7 @@ class HasOne extends Association {
 	public function foreignKey($key = null) {
 		if ($key === null) {
 			if ($this->_foreignKey === null) {
-				$key = Inflector::singularize($this->source()->alias());
-				$this->_foreignKey = Inflector::underscore($key) . '_id';
+				$this->_foreignKey = $this->_modelKey($this->source()->alias());
 			}
 			return $this->_foreignKey;
 		}