Set persistence for introspected model if passed to Migrator (#1221)

atk4 · May 23, 2024 · ecf4784 · ecf4784
1 parent 9d52750
commit ecf4784
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/Schema/Migrator.php b/src/Schema/Migrator.php
@@ -36,7 +36,8 @@ class Migrator
     public const REF_TYPE_LINK = 1;
     public const REF_TYPE_PRIMARY = 2;
 
-    private Connection $_connection;
+    /** @var Connection|Persistence\Sql */
+    private object $_connection;
 
     public Table $table;
 
@@ -48,12 +49,10 @@ class Migrator
      */
     public function __construct(object $source)
     {
-        if ($source instanceof Connection) {
+        if ($source instanceof Connection || $source instanceof Persistence\Sql) {
             $this->_connection = $source;
-        } elseif ($source instanceof Persistence\Sql) {
-            $this->_connection = $source->getConnection();
         } elseif ($source instanceof Model && $source->getPersistence() instanceof Persistence\Sql) { // @phpstan-ignore instanceof.alwaysTrue
-            $this->_connection = $source->getPersistence()->getConnection();
+            $this->_connection = $source->getPersistence();
         } else {
             throw (new Exception('Source must be SQL connection, persistence or initialized model'))
                 ->addMoreInfo('source', $source);
@@ -65,6 +64,18 @@ public function __construct(object $source)
     }
 
     public function getConnection(): Connection
+    {
+        return $this->_connection instanceof Persistence\Sql
+            ? $this->_connection->getConnection()
+            : $this->_connection;
+    }
+
+    protected function hasPersistence(): bool
+    {
+        return $this->_connection instanceof Persistence\Sql;
+    }
+
+    protected function getPersistence(): Persistence\Sql
     {
         return $this->_connection;
     }
@@ -425,6 +436,10 @@ public function introspectTableToModel(string $tableName): Model
             ]);
         }
 
+        if ($this->hasPersistence()) {
+            $model->setPersistence($this->getPersistence());
+        }
+
         return $model;
     }
 

diff --git a/src/Schema/TestCase.php b/src/Schema/TestCase.php
@@ -393,7 +393,6 @@ public function getDb(?array $tableNames = null, bool $noId = false): array
         $resAll = [];
         foreach ($tableNames as $table) {
             $model = $this->createMigrator()->introspectTableToModel($table);
-            $model->setPersistence($this->db);
 
             if (!$noId) {
                 $model->setOrder($model->idField);