Extract columnName function into Column::columnName (#621)

Author: Brian Faust

src/Models/Column.php

@@ -2,6 +2,8 @@
 
 namespace Blueprint\Models;
 
+use Illuminate\Support\Str;
+
 class Column
 {
     private $modifiers;
@@ -61,4 +63,13 @@ public function isUnsigned()
     {
         return in_array('unsigned', $this->modifiers);
     }
+
+    public static function columnName($qualifiedName)
+    {
+        if (Str::contains($qualifiedName, '.')) {
+            return Str::after($qualifiedName, '.');
+        }
+
+        return $qualifiedName;
+    }
 }

src/Models/Statements/EloquentStatement.php

@@ -2,6 +2,7 @@
 
 namespace Blueprint\Models\Statements;
 
+use Blueprint\Models\Column;
 use Illuminate\Support\Str;
 
 class EloquentStatement
@@ -84,7 +85,7 @@ public function output(string $controller_prefix, string $context, bool $using_v
             $code = '$' . Str::camel($model);
             $code .= ' = ';
             $code .= $model;
-            $code .= '::find($' . $this->columnName($this->reference()) . ');';
+            $code .= '::find($' . Column::columnName($this->reference()) . ');';
         }
 
         if ($this->operation() === 'delete') {
@@ -100,16 +101,6 @@ public function output(string $controller_prefix, string $context, bool $using_v
         return $code;
     }
 
-    // TODO: Share this so all other places can use it (Column::columnName($qualifiedName))
-    private function columnName($value)
-    {
-        if (Str::contains($value, '.')) {
-            return Str::after($value, '.');
-        }
-
-        return $value;
-    }
-
     private function usesQualifiedReference()
     {
         return Str::contains($this->reference(), '.');