Fix issue of migration ordering in drop + fix failing tests

SOHELAHMED7 · SOHELAHMED7 · commit 7cf9aa3ce0c1 · 2024-06-21T19:56:12.000+05:30
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
@@ -174,7 +174,7 @@ protected function createBuilder(DbModel $model):BaseMigrationBuilder
     protected function sortMigrationsByDeps():array
     {
         $this->sorted = [];
-        ksort($this->migrations);
+//        ksort($this->migrations);
         foreach ($this->migrations as $migration) {
             //echo "adding {$migration->tableAlias}\n";
             $this->sortByDependencyRecurse($migration);
diff --git a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_change_table_editcolumns.php b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_change_table_editcolumns extends \yii\db\Migration
+class m200000_000003_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_change_table_editcolumns.php b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_change_table_editcolumns extends \yii\db\Migration
+class m200000_000003_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_change_table_editcolumns.php b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_change_table_editcolumns extends \yii\db\Migration
+class m200000_000003_change_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ protected function createBuilder(DbModel $model):BaseMigrationBuilder`
`174`	`174`	`protected function sortMigrationsByDeps():array`
`175`	`175`	`{`
`176`	`176`	`$this->sorted = [];`
`177`		`- ksort($this->migrations);`
	`177`	`+// ksort($this->migrations);`
`178`	`178`	`foreach ($this->migrations as $migration) {`
`179`	`179`	`//echo "adding {$migration->tableAlias}\n";`
`180`	`180`	`$this->sortByDependencyRecurse($migration);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/**`
`4`	`4`	`* Table for Pristine`
`5`	`5`	`*/`
`6`		`-class m200000_000003_create_table_pristines extends \yii\db\Migration`
	`6`	`+class m200000_000000_create_table_pristines extends \yii\db\Migration`
`7`	`7`	`{`
`8`	`8`	`public function up()`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/**`
`4`	`4`	`* Table for Alldbdatatype`
`5`	`5`	`*/`
`6`		`-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration`
	`6`	`+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration`
`7`	`7`	`{`
`8`	`8`	`public function up()`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/**`
`4`	`4`	`* Table for Editcolumn`
`5`	`5`	`*/`
`6`		`-class m200000_000001_change_table_editcolumns extends \yii\db\Migration`
	`6`	`+class m200000_000003_change_table_editcolumns extends \yii\db\Migration`
`7`	`7`	`{`
`8`	`8`	`public function up()`
`9`	`9`	`{`