add column types to generated diagram

Author: mpociot

config/config.php

@@ -18,6 +18,13 @@
      */
     'use_db_schema' => true,
 
+    /*
+     * This setting toggles weather the column types (VARCHAR, INT, TEXT, etc.)
+     * should be visible on the generated diagram. This option requires
+     * 'use_db_schema' to be set to true.
+     */
+    'use_column_types' => true,
+
     /*
      * These colors will be used in the table representation for each entity in
      * your graph.

src/GraphBuilder.php

@@ -60,7 +60,11 @@ protected function getModelLabel(string $model, string $label)
         if (config('erd-generator.use_db_schema')) {
             $columns = $this->getTableColumnsFromModel($model);
             foreach ($columns as $column) {
-                $table .= '<tr width="100%"><td port="' . $column->getName() . '" align="left" width="100%"  bgcolor="'.config('erd-generator.table.row_background_color').'"><font color="'.config('erd-generator.table.row_font_color').'" >' . $column->getName() . '</font></td></tr>' . PHP_EOL;
+                $label = $column->getName();
+                if (config('erd-generator.use_column_types')) {
+                    $label .= ' ('.$column->getType()->getName().')';
+                }
+                $table .= '<tr width="100%"><td port="' . $column->getName() . '" align="left" width="100%"  bgcolor="'.config('erd-generator.table.row_background_color').'"><font color="'.config('erd-generator.table.row_font_color').'" >' . $label . '</font></td></tr>' . PHP_EOL;
             }
         }
 

tests/GenerationTest.php

@@ -12,6 +12,32 @@ class GenerationTest extends TestCase
     /** @test */
     public function it_generated_graphviz_for_test_models()
     {
+        $this->app['config']->set('erd-generator.use_db_schema', false);
+        $this->app['config']->set('erd-generator.directories', [__DIR__.'/Models']);
+
+        Artisan::call('generate:erd', [
+            '--format' => 'text'
+        ]);
+
+        $this->assertMatchesSnapshot(Artisan::output());
+    }
+
+    /** @test */
+    public function it_generated_graphviz_for_test_models_with_db_columns_and_types()
+    {
+        $this->app['config']->set('erd-generator.directories', [__DIR__.'/Models']);
+
+        Artisan::call('generate:erd', [
+            '--format' => 'text'
+        ]);
+
+        $this->assertMatchesSnapshot(Artisan::output());
+    }
+
+    /** @test */
+    public function it_generated_graphviz_for_test_models_with_db_columns()
+    {
+        $this->app['config']->set('erd-generator.use_column_types', false);
         $this->app['config']->set('erd-generator.directories', [__DIR__.'/Models']);
 
         Artisan::call('generate:erd', [

tests/TestCase.php

@@ -2,14 +2,64 @@
 
 namespace BeyondCode\ErdGenerator\Tests;
 
+use Illuminate\Database\Schema\Blueprint;
 use BeyondCode\ErdGenerator\ErdGeneratorServiceProvider;
 
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->setUpDatabase();
+    }
 
     protected function getPackageProviders($app)
     {
         return [ErdGeneratorServiceProvider::class];
     }
 
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('database.default', 'sqlite');
+
+        $app['config']->set('database.connections.sqlite', [
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => '',
+        ]);
+    }
+
+    protected function setUpDatabase()
+    {
+        $this->app['db']->connection()->getSchemaBuilder()->create('avatars', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('url');
+            $table->timestamps();
+        });
+
+        $this->app['db']->connection()->getSchemaBuilder()->create('posts', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('user_id');
+            $table->string('title');
+            $table->text('body');
+            $table->timestamps();
+        });
+
+        $this->app['db']->connection()->getSchemaBuilder()->create('users', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('avatar_id');
+            $table->string('name');
+            $table->string('email');
+            $table->timestamps();
+        });
+
+        $this->app['db']->connection()->getSchemaBuilder()->create('comments', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('post_id');
+            $table->string('body');
+            $table->morphs('commentable');
+        });
+    }
+
 }