fix: refactor migration table creation for consistency and improve test database teardown process.

Author: terabytesoftw

migrations/m250707_103609_tree.php

@@ -8,21 +8,18 @@ class m250707_103609_tree extends Migration
 {
     public function safeUp()
     {
-        $primaryKey = $this->db->driverName === 'oci'
-            ? 'NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY'
-            : $this->primaryKey()->notNull();
-
-        $nameColumn = $this->db->driverName === 'oci'
-            ? $this->string()->notNull()
-            : $this->text()->notNull();
-
-        $this->createTable('{{%tree}}', [
-            'id' => $primaryKey,
-            'name' => $nameColumn,
-            'lft' => $this->integer()->notNull(),
-            'rgt' => $this->integer()->notNull(),
-            'depth' => $this->integer()->notNull(),
-        ]);
+        $rawPrimaryKey = 'NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY';
+
+        $this->createTable(
+            '{{%tree}}',
+            [
+                'id' => $this->db->driverName !== 'oci' ? $this->primaryKey()->notNull() : $rawPrimaryKey,
+                'name' => $this->db->driverName === 'oci' ? $this->string()->notNull() : $this->text()->notNull(),
+                'lft' => $this->integer()->notNull(),
+                'rgt' => $this->integer()->notNull(),
+                'depth' => $this->integer()->notNull(),
+            ],
+        );
 
         $this->createIndex('idx_tree_lft', '{{%tree}}', 'lft');
         $this->createIndex('idx_tree_rgt', '{{%tree}}', 'rgt');

migrations/m250707_104009_multiple_tree.php

@@ -8,22 +8,19 @@ class m250707_104009_multiple_tree extends Migration
 {
     public function safeUp()
     {
-        $primaryKey = $this->db->driverName === 'oci'
-            ? 'NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY'
-            : $this->primaryKey();
-
-        $nameColumn = $this->db->driverName === 'oci'
-            ? $this->string(4000)->notNull()
-            : $this->text()->notNull();
-
-        $this->createTable('{{%multiple_tree}}', [
-            'id' => $primaryKey,
-            'tree' => $this->integer()->null(),
-            'name' => $nameColumn,
-            'lft' => $this->integer()->notNull(),
-            'rgt' => $this->integer()->notNull(),
-            'depth' => $this->integer()->notNull(),
-        ]);
+        $rawPrimaryKey = 'NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY';
+
+        $this->createTable(
+            '{{%multiple_tree}}',
+            [
+                'id' => $this->db->driverName !== 'oci' ? $this->primaryKey()->notNull() : $rawPrimaryKey,
+                'tree' => $this->integer()->null(),
+                'name' => $this->db->driverName === 'oci' ? $this->string()->notNull() : $this->text()->notNull(),
+                'lft' => $this->integer()->notNull(),
+                'rgt' => $this->integer()->notNull(),
+                'depth' => $this->integer()->notNull(),
+            ],
+        );
 
         $this->createIndex('idx_multiple_tree_tree', '{{%multiple_tree}}', 'tree');
         $this->createIndex('idx_multiple_tree_lft', '{{%multiple_tree}}', 'lft');

tests/TestCase.php

@@ -170,11 +170,21 @@ protected function buildFlatXMLDataSet(array $dataSet): string
     protected function createDatabase(): void
     {
         $command = $this->getDb()->createCommand();
+        $dropTables = [
+            'migration',
+            'multiple_tree',
+            'tree',
+        ];
+
+        try {
+            $this->runMigrate('down', ['all']);
+        } catch (RuntimeException) {
+        }
 
-        $this->runMigrate('down', ['all']);
-
-        if ($this->getDb()->getTableSchema('migration', true) !== null) {
-            $command->dropTable('migration')->execute();
+        foreach ($dropTables as $table) {
+            if ($this->getDb()->getTableSchema($table, true) !== null) {
+                $command->dropTable($table)->execute();
+            }
         }
 
         $this->runMigrate('up');
@@ -395,7 +405,11 @@ protected function runMigrate(string $action, array $params = []): mixed
 
         $result = $migrate->run($action, $params);
 
-        ob_get_clean();
+        $capture = ob_get_clean();
+
+        if (is_int($result) && $result !== 0) {
+            throw new RuntimeException("Migration '{$action}' failed with code {$result}.\nOutput: {$capture}");
+        }
 
         return $result;
     }