Fixes yiisoft#162: Model generator now detects foreign keys named as …

…`id_*`
Ariestattoo · Jun 15, 2016 · 2385e71 · 2385e71
1 parent ad215b7
commit 2385e71
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Yii Framework 2 gii extension Change Log
 - Bug #149: Relation names no longer override existing methods and properties (Faryshta)
 - Bug #152: Fixed generating model without any rules (and800)
 - Enh #153: Added filename filter to generated files list preview (thiagotalma)
+- Enh #162: Model generator now detects foreign keys named as `id_*` (mootensai, samdark)
 
 
 2.0.5 March 18, 2016

diff --git a/generators/model/Generator.php b/generators/model/Generator.php
@@ -631,8 +631,12 @@ protected function generateRelationName($relations, $table, $key, $multiple)
             $baseClass = $this->baseClass;
             $baseModel = new $baseClass();
         }
-        if (!empty($key) && substr_compare($key, 'id', -2, 2, true) === 0 && strcasecmp($key, 'id')) {
-            $key = rtrim(substr($key, 0, -2), '_');
+        if (!empty($key) && strcasecmp($key, 'id')) {
+            if (substr_compare($key, 'id', -2, 2, true) === 0) {
+                $key = rtrim(substr($key, 0, -2), '_');
+            } elseif (substr_compare($key, 'id', 0, 2, true) === 0) {
+                $key = ltrim(substr($key, 2, strlen($key)), '_');
+            }
         }
         if ($multiple) {
             $key = Inflector::pluralize($key);