Merge pull request #45 from phalcon/fix/#39-descr-config-key

#39 - Add condition to check from config file
phalcon · Feb 2, 2020 · a20ec58 · a20ec58
2 parents 42879b4 + 34b5851
commit a20ec58
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Console/Commands/Builtin/Migration.php b/src/Console/Commands/Builtin/Migration.php
@@ -73,7 +73,7 @@ public function run(array $parameters): void
             $config = $this->getConfig($path);
         }
 
-        $exportDataFromTables= [];
+        $exportDataFromTables = [];
         if ($this->isReceivedOption('exportDataFromTables')) {
             $exportDataFromTables = explode(',', $this->getOption('exportDataFromTables'));
         } elseif (isset($config['application']['exportDataFromTables'])) {
@@ -129,6 +129,12 @@ public function run(array $parameters): void
         $tableName = $this->isReceivedOption('table') ? $this->getOption('table') : '@';
         $action = $this->getOption(['action', 1]);
 
+        if (isset($config['application']['descr'])) {
+            $descr = $config['application']['descr'];
+        } else {
+            $descr = $this->getOption('descr');
+        }
+
         switch ($action) {
             case 'generate':
                 Migrations::generate([
@@ -141,7 +147,7 @@ public function run(array $parameters): void
                     'force'           => $this->isReceivedOption('force'),
                     'noAutoIncrement' => $this->isReceivedOption('no-auto-increment'),
                     'config'          => $config,
-                    'descr'           => $this->getOption('descr'),
+                    'descr'           => $descr,
                     'verbose'         => $this->isReceivedOption('dry'),
                 ]);
                 break;