Merge pull request #328 from colemanw/referenceColumns

Add FKColumnName to fields metadata
totten · Jan 25, 2024 · 5ea1146 · 5ea1146
2 parents 15a7589 + 0538550
commit 5ea1146
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/CRM/CivixBundle/Command/AddEntityBoilerplateCommand.php b/src/CRM/CivixBundle/Command/AddEntityBoilerplateCommand.php
@@ -191,16 +191,9 @@ private function resolveForeignKeys(&$tables) {
     foreach ($tables as &$table) {
       if (isset($table['foreignKey'])) {
         foreach ($table['foreignKey'] as &$key) {
-          if (isset($tables[$key['table']])) {
-            $key['className'] = $tables[$key['table']]['className'];
-            $key['fileName'] = $tables[$key['table']]['fileName'];
-            $table['fields'][$key['name']]['FKClassName'] = $key['className'];
-          }
-          else {
-            $key['className'] = \CRM_Core_DAO_AllCoreTables::getClassForTable($key['table']);
-            $key['fileName'] = $key['className'] . '.php';
-            $table['fields'][$key['name']]['FKClassName'] = $key['className'];
-          }
+          $key['className'] = $tables[$key['table']]['className'] ?? \CRM_Core_DAO_AllCoreTables::getClassForTable($key['table']);
+          $table['fields'][$key['name']]['FKClassName'] = $key['className'];
+          $table['fields'][$key['name']]['FKColumnName'] = $key['key'];
         }
       }
     }