refactor(Model): init schema if option exists and is not empty

phalcon · May 21, 2019 · 50bb25e · 50bb25e
1 parent 2693c64
commit 50bb25e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/scripts/Phalcon/Builder/Model.php b/scripts/Phalcon/Builder/Model.php
@@ -153,15 +153,14 @@ public function build()
 
         $initialize = [];
 
-        if ($this->modelOptions->hasOption('schema')) {
+        // use option schema if exists and is not empty
+        if ($this->modelOptions->hasOption('schema') && !empty($this->modelOptions->getOption('schema'))) {
             $schema = $this->modelOptions->getOption('schema');
+            $initialize['schema'] = $snippet->getThisMethod('setSchema', $schema);
         } else {
             $schema = Utils::resolveDbSchema($config->database);
         }
 
-        if (!empty($this->modelOptions->getOption('schema'))) {
-            $initialize['schema'] = $snippet->getThisMethod('setSchema', $schema);
-        }
         $initialize['source'] = $snippet->getThisMethod('setSource', $this->modelOptions->getOption('name'));
 
         $table = $this->modelOptions->getOption('name');