Merge pull request #27 from burzum/feature/fk-table

Made the table field configurable.
UseMuffin · Nov 30, 2015 · 2f58909 · 2f58909
2 parents 50b4a40 + 8262991
commit 2f58909
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Model/Behavior/TagBehavior.php b/src/Model/Behavior/TagBehavior.php
@@ -43,6 +43,7 @@ class TagBehavior extends Behavior
         'implementedMethods' => [
             'normalizeTags' => 'normalizeTags',
         ],
+        'fkTableField' => 'fk_table'
     ];
 
     /**
@@ -103,7 +104,7 @@ public function bindAssociations()
         $table = $this->_table;
         $tableAlias = $this->_table->alias();
 
-        $assocConditions = [$taggedAlias . '.fk_table' => $table->table()];
+        $assocConditions = [$taggedAlias . '.' . $this->config('fkTableField') => $table->table()];
 
         if (!$table->association($taggedAlias)) {
             $table->hasMany($taggedAlias, $taggedAssoc + [
@@ -189,7 +190,7 @@ public function attachCounters()
         if (!$counterCache->config($taggedAlias)) {
             $field = key($config['taggedCounter']);
             $config['taggedCounter']['tag_count']['conditions'] = [
-                $taggedTable->aliasField('fk_table') => $this->_table->table()
+                $taggedTable->aliasField($this->config('fkTableField')) => $this->_table->table()
             ];
             $counterCache->config($this->_table->alias(), $config['taggedCounter']);
         }
@@ -209,7 +210,7 @@ public function normalizeTags($tags)
 
         $result = [];
 
-        $common = ['_joinData' => ['fk_table' => $this->_table->table()]];
+        $common = ['_joinData' => [$this->config('fkTableField') => $this->_table->table()]];
         if ($namespace = $this->config('namespace')) {
             $common += compact('namespace');
         }