#1 Pivot naming

Using studly version of pivot table name when label is "Pivot" rather than use custom intermediate table class names.
rethink-group · Sep 9, 2021 · 90a80df · 90a80df
1 parent de3b7d5
commit 90a80df
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/src/GraphBuilder.php b/src/GraphBuilder.php
@@ -170,6 +170,9 @@ protected function connectBelongsToMany(
             $pivotModel->setTable($eloquentRelation->getTable());
             $label = (new \ReflectionClass($pivotClass))->getShortName();
             $pivotTable = $eloquentRelation->getTable();
+            if ($label == "Pivot") {
+                $label = \Str::studly($pivotTable);
+            }
             $this->addNodeToGraph($pivotModel, $pivotTable, $label);
 
             $pivotModelNode = $this->graph->findNode($pivotTable);
@@ -216,4 +219,4 @@ protected function connectByRelation(
 
         $this->connectNodes($modelNode, $relatedModelNode, $relation);
     }
-}
+}
diff --git a/tests/__snapshots__/GenerationTest__it_generated_graphviz_for_test_models__1.php b/tests/__snapshots__/GenerationTest__it_generated_graphviz_for_test_models__1.php
@@ -2,8 +2,6 @@
 Inspecting model relations.
 
  1/4 [▓▓▓▓▓▓▓░░░░░░░░░░░░░░░░░░░░░]  25%
- 2/4 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░░░░░░░░]  50%
- 3/4 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░]  75%
  4/4 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%digraph "G" {
 style="filled"
 bgcolor="#F7F7F7"
@@ -134,7 +132,7 @@
 ]
 "comment_user" [
 label=<<table width="100%" height="100%" border="0" margin="0" cellborder="1" cellspacing="0" cellpadding="10">
-<tr width="100%"><td width="100%" bgcolor="#d3d3d3"><font color="#333333">Pivot</font></td></tr>
+<tr width="100%"><td width="100%" bgcolor="#d3d3d3"><font color="#333333">CommentUser</font></td></tr>
 </table>>
 margin="0"
 shape="rectangle"

diff --git a/..._snapshots__/GenerationTest__it_generated_graphviz_for_test_models_with_db_columns__1.php b/..._snapshots__/GenerationTest__it_generated_graphviz_for_test_models_with_db_columns__1.php
@@ -2,8 +2,6 @@
 Inspecting model relations.
 
  1/4 [▓▓▓▓▓▓▓░░░░░░░░░░░░░░░░░░░░░]  25%
- 2/4 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░░░░░░░░]  50%
- 3/4 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░]  75%
  4/4 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%digraph "G" {
 style="filled"
 bgcolor="#F7F7F7"
@@ -155,7 +153,7 @@
 ]
 "comment_user" [
 label=<<table width="100%" height="100%" border="0" margin="0" cellborder="1" cellspacing="0" cellpadding="10">
-<tr width="100%"><td width="100%" bgcolor="#d3d3d3"><font color="#333333">Pivot</font></td></tr>
+<tr width="100%"><td width="100%" bgcolor="#d3d3d3"><font color="#333333">CommentUser</font></td></tr>
 <tr width="100%"><td port="id" align="left" width="100%"  bgcolor="#ffffff"><font color="#333333" >id</font></td></tr>
 <tr width="100%"><td port="comment_id" align="left" width="100%"  bgcolor="#ffffff"><font color="#333333" >comment_id</font></td></tr>
 <tr width="100%"><td port="user_id" align="left" width="100%"  bgcolor="#ffffff"><font color="#333333" >user_id</font></td></tr>

diff --git a/...__/GenerationTest__it_generated_graphviz_for_test_models_with_db_columns_and_types__1.php b/...__/GenerationTest__it_generated_graphviz_for_test_models_with_db_columns_and_types__1.php
@@ -2,8 +2,6 @@
 Inspecting model relations.
 
  1/4 [▓▓▓▓▓▓▓░░░░░░░░░░░░░░░░░░░░░]  25%
- 2/4 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░░░░░░░░]  50%
- 3/4 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░]  75%
  4/4 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%digraph "G" {
 style="filled"
 bgcolor="#F7F7F7"
@@ -155,7 +153,7 @@
 ]
 "comment_user" [
 label=<<table width="100%" height="100%" border="0" margin="0" cellborder="1" cellspacing="0" cellpadding="10">
-<tr width="100%"><td width="100%" bgcolor="#d3d3d3"><font color="#333333">Pivot</font></td></tr>
+<tr width="100%"><td width="100%" bgcolor="#d3d3d3"><font color="#333333">CommentUser</font></td></tr>
 <tr width="100%"><td port="id" align="left" width="100%"  bgcolor="#ffffff"><font color="#333333" >id (integer)</font></td></tr>
 <tr width="100%"><td port="comment_id" align="left" width="100%"  bgcolor="#ffffff"><font color="#333333" >comment_id (integer)</font></td></tr>
 <tr width="100%"><td port="user_id" align="left" width="100%"  bgcolor="#ffffff"><font color="#333333" >user_id (integer)</font></td></tr>