V2 additional generation commands

composer.json

@@ -22,7 +22,8 @@
         "illuminate/contracts": ">=5.1",
         "illuminate/filesystem": ">=5.1",
         "illuminate/console": ">=5.1",
-        "php-libs/observable": "^1.0"
+        "php-libs/observable": "^1.3",
+        "php-libs/value-states": "^1.3"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",

config/reliese.php

@@ -1,10 +1,12 @@
 <?php
-
 use Reliese\Analyser\Doctrine\MySqlDoctrineDatabaseAssistant;
 use Reliese\Configuration\DatabaseAnalyserConfiguration;
 use Reliese\Configuration\DatabaseBlueprintConfiguration;
-use Reliese\Configuration\DataTransportGeneratorConfiguration;
+use Reliese\Configuration\DataTransportObjectGeneratorConfiguration;
 use Reliese\Configuration\ModelDataMapGeneratorConfiguration;
+use Reliese\Configuration\DataAccessGeneratorConfiguration;
+use Reliese\Configuration\DataAttributeGeneratorConfiguration;
+use Reliese\Configuration\DataTransportCollectionGeneratorConfiguration;
 use Reliese\Configuration\ModelGeneratorConfiguration;
 
 /*
@@ -87,11 +89,11 @@
                     // except everything in schema
                     ['schemas' => ['information_schema', 'performance_schema', 'mysql', 'sys']],
                     // except audit.log_.* tables
-                    ['schemas' => ['audit'], 'tables' => ['/^log_.*$/']],
+                    //['schemas' => ['audit'], 'tables' => ['/^log_.*$/']],
                     // except any table that ends in migrations or matches 'phinx' on all schemas
                     ['schemas' => [$all], 'tables' => ['/^.*migrations$/', 'phinx']],
                     // except soft delete columns on all tables for all schemas
-                    ['schemas' => [$all], 'tables' => [$all], 'columns' => ['deleted_on']]
+                    //['schemas' => [$all], 'tables' => [$all], 'columns' => ['deleted_on']]
                 ],
             ],
             /*
@@ -527,24 +529,59 @@
             ],
         ],
         // endregion Model Generator Config
+
+        // region Data Access Generator Config
+        DataAccessGeneratorConfiguration::class => [
+            'Path' => app_path().'/DataAccess/PrimaryDatabase',
+            'Namespace' => 'app\DataAccess\PrimaryDatabase',
+            //'ClassPrefix' => '',
+            'ClassSuffix' => 'DataAccess',
+            'ParentClassPrefix' => 'Abstract',
+        ],
+        // endregion Data Access Generator Config
+
+        // region Data Attribute Generator Config
+        DataAttributeGeneratorConfiguration::class => [
+            'Path' => app_path().'/DataAttribute/PrimaryDatabase',
+            'Namespace' => 'App\DataAttribute\Objects',
+            'ClassPrefix' => 'With',
+            'ClassSuffix' => 'Trait',
+            'ParentClassPrefix' => 'Abstract',
+        ],
+        // endregion Data Attribute Generator Config
+
         // region Data Transport Generator Config
-        DataTransportGeneratorConfiguration::class => [
+
+        DataTransportObjectGeneratorConfiguration::class => [
             'Path' => app_path().'/DataTransportObjects',
             'Namespace' => 'App\DataTransportObjects',
             'ClassSuffix' => 'Dto',
             'ParentClassPrefix' => 'Abstract',
+            'UseValueStateTracking' => true,
             'ObservableProperties' => [
                 'BeforeChange' => false,
                 'AfterChange' => false,
             ],
         ],
         // endregion Data Transport Generator Config
+
+        // region Data Transport Collection Generator Config
+        DataTransportCollectionGeneratorConfiguration::class => [
+            'Path' => app_path().'/DataTransport/Collections',
+            'Namespace' => 'App\DataTransport\Collections',
+            'ClassSuffix' => 'Dto',
+            'ParentClassPrefix' => 'Abstract',
+        ],
+        // endregion Data Transport Collection Generator Config
+
         // region Data Map Generator Config
         ModelDataMapGeneratorConfiguration::class => [
             'Path' => app_path().'/DataMaps/PrimaryDatabase',
             'Namespace' => 'App\DataMaps\PrimaryDatabase',
             'ClassSuffix' => 'Map',
             'ParentClassPrefix' => 'Abstract',
+            'AccessorTraitNamespace' => 'app\DataMapAccessors\PrimaryDatabase',
+            'AccessorTraitPath' => app_path().'/DataMapAccessors/PrimaryDatabase',
         ],
         // endregion Data Map Generator Config
     ]

src/Analyser/Doctrine/DoctrineDatabaseAnalyser.php

@@ -60,7 +60,7 @@ public function analyseDatabase(DatabaseBlueprintConfiguration $databaseBlueprin
                 continue;
             }
 
-            $schemaAnalyser = $this->getSchemaAnalyser($databaseBlueprint, $schemaName);
+            $schemaAnalyser = $this->getSchemaAnalyser($databaseBlueprint, $schemaName, $databaseBlueprintConfiguration);
             $databaseBlueprint->addSchemaBlueprint(
                 // TODO: Add support for Views
                 $schemaAnalyser->analyseSchemaObjectStructures()
@@ -71,7 +71,7 @@ public function analyseDatabase(DatabaseBlueprintConfiguration $databaseBlueprin
          * Analyse foreign key constraint relationships which could potentially span schemas
          */
         foreach ($schemaNames as $schemaName) {
-            $schemaAnalyser = $this->getSchemaAnalyser($databaseBlueprint, $schemaName);
+            $schemaAnalyser = $this->getSchemaAnalyser($databaseBlueprint, $schemaName, $databaseBlueprintConfiguration);
 
             foreach ($schemaAnalyser->getTableDefinitions() as $tableName => $doctrineTableDefinition) {
 
@@ -164,7 +164,11 @@ protected function getSchemaNames(): array
      *
      * @return DoctrineSchemaAnalyser
      */
-    protected function getSchemaAnalyser(DatabaseBlueprint $databaseBlueprint, string $schemaName): DoctrineSchemaAnalyser
+    protected function getSchemaAnalyser(
+        DatabaseBlueprint $databaseBlueprint,
+        string $schemaName,
+        DatabaseBlueprintConfiguration $databaseBlueprintConfiguration
+    ): DoctrineSchemaAnalyser
     {
         if (array_key_exists($schemaName, $this->schemaAnalysers)) {
             return $this->schemaAnalysers[$schemaName];
@@ -178,7 +182,8 @@ protected function getSchemaAnalyser(DatabaseBlueprint $databaseBlueprint, strin
             $databaseBlueprint,
             $this,
             $schemaSpecificConnection,
-            $schemaSpecificDoctrineSchemaManager
+            $schemaSpecificDoctrineSchemaManager,
+            $databaseBlueprintConfiguration
         );
     }
 }

src/Analyser/Doctrine/DoctrineSchemaAnalyser.php

@@ -16,6 +16,7 @@
 use Reliese\Blueprint\IndexBlueprint;
 use Reliese\Blueprint\SchemaBlueprint;
 use Reliese\Blueprint\TableBlueprint;
+use Reliese\Configuration\DatabaseBlueprintConfiguration;
 
 /**
  * Class DoctrineSchemaAnalyser
@@ -27,6 +28,11 @@ class DoctrineSchemaAnalyser
      */
     private DatabaseBlueprint $databaseBlueprint;
 
+    /**
+     * @var DatabaseBlueprintConfiguration
+     */
+    private DatabaseBlueprintConfiguration $databaseBlueprintConfiguration;
+
     /**
      * @var DoctrineDatabaseAnalyser
      */
@@ -66,14 +72,16 @@ public function __construct(
         DatabaseBlueprint $databaseBlueprint,
         DoctrineDatabaseAnalyser $doctrineDatabaseAnalyser,
         ConnectionInterface $connection,
-        AbstractSchemaManager $doctrineSchemaManager
+        AbstractSchemaManager $doctrineSchemaManager,
+        DatabaseBlueprintConfiguration $databaseBlueprintConfiguration
     )
     {
         $this->schemaName = $schemaName;
         $this->databaseBlueprint = $databaseBlueprint;
         $this->doctrineDatabaseAnalyser = $doctrineDatabaseAnalyser;
         $this->schemaSpecificConnection = $connection;
         $this->doctrineSchemaManager = $doctrineSchemaManager;
+        $this->databaseBlueprintConfiguration = $databaseBlueprintConfiguration;
     }
 
     /**
@@ -110,6 +118,13 @@ public function analyseSchemaObjectStructures(): SchemaBlueprint
         $tableDefinitions = $this->getDoctrineSchemaManager()->listTables();
         if (!empty($tableDefinitions)) {
             foreach ($tableDefinitions as $tableDefinition) {
+                $isExcluded = $this->databaseBlueprintConfiguration
+                    ->getSchemaFilter()
+                    ->isExcludedTable($this->getSchemaName(), $tableDefinition->getName())
+                ;
+                if ($isExcluded) {
+                    continue;
+                }
                 /*
                  * Keep for future use
                  */
@@ -189,6 +204,15 @@ private function analyseTableColumns(Table $tableDefinition, TableBlueprint $tab
         }
 
         foreach ($columnDefinitions as $columnDefinition) {
+            $isExcluded = $this->databaseBlueprintConfiguration->getSchemaFilter()->isExcludedColumn(
+                $this->getSchemaName(),
+                $tableDefinition->getName(),
+                $columnDefinition->getName()
+            );
+            if ($isExcluded) {
+                continue;
+            }
+
             $columnBlueprint = $this->analyseColumn($tableBlueprint, $columnDefinition);
             $tableBlueprint->addColumnBlueprint($columnBlueprint);
         }
@@ -258,7 +282,7 @@ private function analyseIndex(TableBlueprint $tableBlueprint, Index $indexDefini
             $indexDefinition->getName(),
             $columnBlueprints,
             $indexDefinition->isPrimary(),
-            false
+            $indexDefinition->isUnique()
         );
     }
 

src/Blueprint/ColumnOwnerInterface.php

@@ -7,7 +7,7 @@
  *
  * @package Reliese\Blueprint
  */
-interface ColumnOwnerInterface
+interface ColumnOwnerInterface extends SchemaMemberInterface
 {
     /**
      * @param ColumnBlueprint $columnBlueprint
@@ -30,11 +30,4 @@ public function getColumnBlueprints(): array;
      * @return string[]
      */
     public function getColumnNames(): array;
-
-    /**
-     * returns "Schema.[TableName |View Name]"
-     *
-     * @return string
-     */
-    public function getUniqueName(): string;
 }

src/Blueprint/ForeignKeyBlueprint.php

@@ -101,4 +101,28 @@ public function getReferencedTableBlueprint() : ColumnOwnerInterface
     {
         return $this->referencedTable;
     }
+
+    /**
+     * @return ColumnBlueprint[]
+     */
+    public function getReferencedColumns() : array
+    {
+        return $this->referencedColumns;
+    }
+
+    public function getFkColumnPairs():array
+    {
+        $columns = [];
+        $i = -1;
+        foreach ($this->referencingColumns as $referencingColumn) {
+            $i++;
+            $columns[$i][0] = $referencingColumn;
+        }
+        $i = -1;
+        foreach ($this->referencedColumns as $referencedColumn) {
+            $i++;
+            $columns[$i][1] = $referencedColumn;
+        }
+        return $columns;
+    }
 }

src/Blueprint/IndexBlueprint.php

@@ -8,6 +8,7 @@
 class IndexBlueprint implements ColumnOwnerInterface
 {
     use ColumnOwnerTrait;
+    use SchemaMemberTrait;
 
     /**
      * @var string
@@ -79,4 +80,14 @@ public function isUnique(): bool
     {
         return $this->isUnique || $this->isPrimaryKey();
     }
+
+    public function getSchemaMemberType(): SchemaMemberType
+    {
+        return SchemaMemberType::Index();
+    }
+
+    public function getName(): string
+    {
+        return $this->indexName;
+    }
 }

src/Blueprint/SchemaMemberInterface.php

@@ -18,6 +18,11 @@ interface SchemaMemberInterface
      */
     public function getName(): string;
 
+    /**
+     * @return string
+     */
+    public function getUniqueName(): string;
+
     /**
      * Returns an instance of SchemaMemberType
      *

src/Blueprint/SchemaMemberTrait.php

@@ -54,4 +54,18 @@ public function setName(string $name)
     {
         $this->name = $name;
     }
+
+    /**
+     * @return string
+     */
+    public function getUniqueName(): string
+    {
+        if (empty($this->getSchemaBlueprint()->getSchemaName())) {
+            return $this->getName();
+        }
+
+        return sprintf('%s.%s',
+            $this->getSchemaBlueprint()->getSchemaName(),
+            $this->getName());
+    }
 }