Merge branch 'master' into no-yii-autoloader

bizley · Feb 15, 2021 · fe26e44 · fe26e44
2 parents b62bce4 + e405ae9
commit fe26e44
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Extractor.php b/src/Extractor.php
@@ -63,7 +63,7 @@ public function extract(string $migration, array $migrationPaths): void
             require_once $file;
         }
 
-        $this->subject = new $migration(['db' => clone $this->db, 'experimental' => $this->experimental]);
+        $this->subject = new $migration(['db' => $this->db, 'experimental' => $this->experimental]);
         if ($this->subject instanceof MigrationChangesInterface === false) {
             throw new ErrorException(
                 "Class '{$migration}' must implement bizley\migration\dummy\MigrationChangesInterface."

diff --git a/src/controllers/BaseMigrationController.php b/src/controllers/BaseMigrationController.php
@@ -36,6 +36,7 @@
 use yii\console\Controller;
 use yii\db\Connection;
 use yii\db\Query;
+use yii\di\Instance;
 
 /**
  * This is the foundation of MigrationController. All services are registered here.
@@ -278,7 +279,9 @@ public function getGenerator(): GeneratorInterface
     public function getExtractor(): ExtractorInterface
     {
         if ($this->extractor === null) {
-            $configuredObject = Yii::createObject($this->extractorClass, [$this->db, $this->experimental]);
+            $db = Instance::ensure($this->db, Connection::class);
+            // cloning connection here to not force reconnecting on each extraction
+            $configuredObject = Yii::createObject($this->extractorClass, [clone $db, $this->experimental]);
             if (!$configuredObject instanceof ExtractorInterface) {
                 throw new InvalidConfigException('Extractor must implement bizley\migration\ExtractorInterface.');
             }