feature/append connection

config/reliese.php

@@ -195,7 +195,7 @@
             |
             */
 
-            'connection' => false,
+            'AppendConnection' => false,
 
             /*
             |--------------------------------------------------------------------------

src/Analyser/Doctrine/DoctrineDatabaseAnalyser.php

@@ -178,4 +178,15 @@ protected function getSchemaAnalyser(DatabaseBlueprint $databaseBlueprint, strin
             $schemaSpecificDoctrineSchemaManager
         );
     }
+
+    /**
+     * @return string
+     */
+    public function getConnectionName(): string
+    {
+        return $this->doctrineDatabaseAssistant->getRelieseConfiguration()
+                                               ->getDatabaseAnalyserConfiguration()
+                                               ->getConnectionName()
+            ;
+    }
 }

src/Analyser/Doctrine/DoctrineDatabaseAssistantInterface.php

@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Illuminate\Database\ConnectionInterface;
+use Reliese\Configuration\RelieseConfiguration;
 
 /**
  * Interface DoctrineDatabaseAssistantInterface
@@ -30,4 +31,9 @@ public function getConnection(string $schemaName): ConnectionInterface;
      * @throws Exception
      */
     public function getDoctrineSchemaManager(?string $schemaName = null): AbstractSchemaManager;
+
+    /**
+     * @return RelieseConfiguration
+     */
+    public function getRelieseConfiguration(): RelieseConfiguration;
 }

src/Analyser/Doctrine/DoctrineSchemaAnalyser.php

@@ -90,7 +90,11 @@ public function getSchemaBlueprint(): SchemaBlueprint
             return $this->schemaBlueprint;
         }
 
-        return $this->schemaBlueprint = new SchemaBlueprint($this->getDatabaseBlueprint(), $this->getSchemaName());
+        return $this->schemaBlueprint = new SchemaBlueprint(
+            $this->getDatabaseBlueprint(),
+            $this->getSchemaName(),
+            $this->getConnectionName()
+        );
     }
 
     /**
@@ -317,4 +321,12 @@ protected function getDatabaseBlueprint(): DatabaseBlueprint
     {
         return $this->databaseBlueprint;
     }
+
+    /**
+     * @return string
+     */
+    public function getConnectionName(): string
+    {
+        return $this->doctrineDatabaseAnalyser->getConnectionName();
+    }
 }

src/Analyser/Doctrine/MySqlDoctrineDatabaseAssistant.php

@@ -12,6 +12,11 @@
  */
 class MySqlDoctrineDatabaseAssistant implements DoctrineDatabaseAssistantInterface
 {
+    /**
+     * @var RelieseConfiguration
+     */
+    private RelieseConfiguration $relieseConfiguration;
+
     /**
      * @var ConnectionInterface
      */
@@ -40,6 +45,7 @@ public function __construct(
         $this->connectionFactory = $connectionFactory;
         $this->configuredConnection = $configuredConnection;
         $this->schemaConnections[$configuredConnection->getConfig('database')] = $configuredConnection;
+        $this->relieseConfiguration = $relieseConfiguration;
     }
 
     public function getSchemaNames(): array
@@ -92,4 +98,12 @@ public function getDoctrineSchemaManager(?string $schemaName = null): AbstractSc
 
         return $this->doctrineSchemaManagers[$schemaName] = $doctrineSchemaManager;
     }
+
+    /**
+     * @return RelieseConfiguration
+     */
+    public function getRelieseConfiguration(): RelieseConfiguration
+    {
+        return $this->relieseConfiguration;
+    }
 }

src/Analyser/Doctrine/SqliteDoctrineDatabaseAssistant.php

@@ -66,4 +66,12 @@ public function getDoctrineSchemaManager(?string $schemaName = null): AbstractSc
     {
         return $this->doctrineSchemaManagers['default'] ??= $this->getConnection()->getDoctrineSchemaManager();
     }
+
+    /**
+     * @return RelieseConfiguration
+     */
+    public function getRelieseConfiguration(): RelieseConfiguration
+    {
+        return $this->relieseConfiguration;
+    }
 }

src/Blueprint/SchemaBlueprint.php

@@ -3,25 +3,31 @@
 namespace Reliese\Blueprint;
 
 use InvalidArgumentException;
+
 /**
  * Class SchemaBlueprint
  */
 class SchemaBlueprint
 {
+    /**
+     * @var string
+     */
+    private string $connectionName;
+
     /**
      * @var DatabaseBlueprint
      */
-    private $databaseBlueprint;
+    private DatabaseBlueprint $databaseBlueprint;
 
     /**
      * @var string
      */
-    private $schemaName;
+    private string $schemaName;
 
     /**
      * @var TableBlueprint[]
      */
-    private $tableBlueprints = [];
+    private array $tableBlueprints = [];
 
     /**
      * @var ViewBlueprint[]
@@ -33,11 +39,13 @@ class SchemaBlueprint
      *
      * @param DatabaseBlueprint $databaseBlueprint
      * @param string            $schemaName
+     * @param string            $connectionName
      */
-    public function __construct(DatabaseBlueprint $databaseBlueprint, string $schemaName)
+    public function __construct(DatabaseBlueprint $databaseBlueprint, string $schemaName, string $connectionName)
     {
         $this->schemaName = $schemaName;
         $this->databaseBlueprint = $databaseBlueprint;
+        $this->connectionName = $connectionName;
     }
 
     /**
@@ -121,4 +129,23 @@ public function hasTableBlueprint(string $tableName) : bool
     {
         return \array_key_exists($tableName, $this->tableBlueprints);
     }
+
+    /**
+     * @return string
+     */
+    public function getConnectionName(): string
+    {
+        return $this->connectionName;
+    }
+
+    /**
+     * @param string $connectionName
+     *
+     * @return SchemaBlueprint
+     */
+    public function setConnectionName(string $connectionName): static
+    {
+        $this->connectionName = $connectionName;
+        return $this;
+    }
 }

src/Blueprint/SchemaMemberTrait.php

@@ -14,10 +14,15 @@ trait SchemaMemberTrait
     /**
      * @var SchemaBlueprint
      */
-    private $schemaBlueprint;
+    private SchemaBlueprint $schemaBlueprint;
 
     /**
-     * @return SchemaBlueprint|null
+     * @var string
+     */
+    private string $name;
+
+    /**
+     * @return SchemaBlueprint
      */
     public function getSchemaBlueprint(): SchemaBlueprint
     {
@@ -32,11 +37,6 @@ public function setSchemaBlueprint(SchemaBlueprint $schemaBlueprint)
         $this->schemaBlueprint = $schemaBlueprint;
     }
 
-    /**
-     * @var string
-     */
-    private $name;
-
     /**
      * Returns the name of that uniquely identifies this schema member
      *

src/Blueprint/TableBlueprint.php

@@ -31,8 +31,7 @@ class TableBlueprint implements SchemaMemberInterface, ColumnOwnerInterface
      * @param SchemaBlueprint $schemaBlueprint
      * @param string $tableName
      */
-    public function __construct(SchemaBlueprint $schemaBlueprint,
-        string $tableName)
+    public function __construct(SchemaBlueprint $schemaBlueprint, string $tableName)
     {
         $this->setSchemaBlueprint($schemaBlueprint);
         $this->setName($tableName);

src/Blueprint/ViewBlueprint.php

@@ -2,7 +2,6 @@
 
 namespace Reliese\Blueprint;
 
-use Doctrine\DBAL\Schema\View;
 /**
  * Class ViewBlueprint
  */
@@ -11,11 +10,6 @@ class ViewBlueprint implements SchemaMemberInterface, ColumnOwnerInterface
     use SchemaMemberTrait;
     use ColumnOwnerTrait;
 
-    /**
-     * @var SchemaBlueprint
-     */
-    private $schemaBlueprint;
-
     /**
      * ViewBlueprint constructor.
      *
@@ -35,4 +29,14 @@ public function getSchemaMemberType(): SchemaMemberType
     {
         return SchemaMemberType::View();
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUniqueName(): string
+    {
+        return sprintf('%s.%s',
+            $this->getSchemaBlueprint()->getSchemaName(),
+            $this->getName());
+    }
 }

src/Configuration/ModelGeneratorConfiguration.php

@@ -2,6 +2,8 @@
 
 namespace Reliese\Configuration;
 
+use Illuminate\Database\Eloquent\Model;
+
 /**
  * Class ModelGeneratorConfiguration
  */
@@ -13,6 +15,7 @@ class ModelGeneratorConfiguration
     const KEY_PARENT_CLASS_PREFIX = 'ParentClassPrefix';
     const KEY_PARENT = 'Parent';
     const KEY_TRAITS = 'Traits';
+    const KEY_APPEND_CONNECTION = 'AppendConnection';
 
     /**
      * @var string
@@ -44,23 +47,25 @@ class ModelGeneratorConfiguration
      */
     private array $traits = [];
 
+    /**
+     * @var bool
+     */
+    private bool $appendConnection;
+
     /**
      * ModelGeneratorConfiguration constructor.
      *
      * @param array $configuration
      */
     public function __construct(array $configuration = [])
     {
-        if (empty($configuration)) {
-            return ;
-        }
-
-        $this->setPath($configuration[static::KEY_PATH]);
-        $this->setNamespace($configuration[static::KEY_NAMESPACE]);
+        $this->setPath($configuration[static::KEY_PATH] ?? '');
+        $this->setNamespace($configuration[static::KEY_NAMESPACE] ?? '');
         $this->setClassSuffix($configuration[static::KEY_CLASS_SUFFIX] ?? '');
         $this->setParentClassPrefix($configuration[static::KEY_PARENT_CLASS_PREFIX] ?? '');
-        $this->setParent($configuration[static::KEY_PARENT]);
+        $this->setParent($configuration[static::KEY_PARENT] ?? Model::class);
         $this->setTraits($configuration[static::KEY_TRAITS] ?? []);
+        $this->appendConnection($configuration[static::KEY_APPEND_CONNECTION] ?? false);
     }
 
     /**
@@ -181,4 +186,23 @@ public function getTraits(): array
     {
         return $this->traits;
     }
+
+    /**
+     * @param bool $append
+     *
+     * @return $this
+     */
+    public function appendConnection(bool $append): static
+    {
+        $this->appendConnection = $append;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function appendsConnection(): bool
+    {
+        return $this->appendConnection;
+    }
 }

src/Generator/Model/ModelGenerator.php

@@ -20,6 +20,7 @@
 class ModelGenerator
 {
     const PROPERTY_TABLE = 'table';
+    const PROPERTY_CONNECTION = 'connection';
 
     private MySqlDataTypeMap $dataTypeMap;
 
@@ -221,6 +222,10 @@ private function generateProperties(TableBlueprint $tableBlueprint): array
             $properties[] = $this->generateTableProperty($tableBlueprint);
         }
 
+        if ($this->modelGeneratorConfiguration->appendsConnection()) {
+            $properties[] = $this->generateConnectionProperty($tableBlueprint);
+        }
+
         return $properties;
     }
 
@@ -241,7 +246,7 @@ private function generateTableProperty(TableBlueprint $tableBlueprint): ClassPro
     {
         $property = new ClassPropertyDefinition(
             static::PROPERTY_TABLE,
-            PhpTypeEnum::stringType(),
+            PhpTypeEnum::absentTypeEnum(),
             VisibilityEnum::protectedEnum()
         );
 
@@ -272,4 +277,22 @@ private function generateTraits(TableBlueprint $tableBlueprint): array
 
         return $traitDefinitions;
     }
+
+    /**
+     * @param TableBlueprint $tableBlueprint
+     *
+     * @return ClassPropertyDefinition
+     */
+    private function generateConnectionProperty(TableBlueprint $tableBlueprint): ClassPropertyDefinition
+    {
+        $property = new ClassPropertyDefinition(
+            static::PROPERTY_CONNECTION,
+            PhpTypeEnum::absentTypeEnum(),
+            VisibilityEnum::protectedEnum()
+        );
+
+        $property->setValue($tableBlueprint->getSchemaBlueprint()->getConnectionName());
+
+        return $property;
+    }
 }