Restore original migrations to v1 schema and consolidate v2 changes in upgrade migration

Changelog: fixed

Author: soymgomez

database/migrations/0000_03_07_190506_create_countries_table.php

@@ -40,12 +40,12 @@ public function up(): void
 
             $table->string('tld', 8);
             $table->string('native', 80)->nullable();
-            $table->string('region_name', 80);
+            $table->string('region', 80);
 
             if (config()->boolean('atlas.entities.regions')) {
-                $table->foreignId('region_id')->nullable()->constrained(config()->string('atlas.regions_tablename'))->nullOnDelete();
+                $table->foreignId('region_id')->constrained(config()->string('atlas.regions_tablename'))->nullOnDelete();
             }
-            $table->string('subregion_name', 80)->nullable();
+            $table->string('subregion', 80)->nullable();
 
             if (config()->boolean('atlas.entities.subregions')) {
                 $table->foreignId('subregion_id')->nullable()->constrained(config()->string('atlas.subregions_tablename'))->nullOnDelete();
@@ -56,9 +56,6 @@ public function up(): void
             $table->string('longitude', 15);
             $table->string('emoji', 40);
             $table->string('emojiU', 40);
-
-            $table->index('iso2');
-            $table->index('iso3');
         });
     }
 

database/migrations/0000_03_07_190507_create_states_table.php

@@ -37,8 +37,6 @@ public function up(): void
             $table->string('type')->nullable();
             $table->string('latitude')->nullable();
             $table->string('longitude')->nullable();
-
-            $table->index('state_code');
         });
     }
 

database/migrations/0000_03_07_190508_create_cities_table.php

@@ -44,8 +44,6 @@ public function up(): void
             $table->string('latitude');
             $table->string('longitude');
             $table->string('wiki_data_id')->nullable();
-
-            $table->index('name');
         });
     }
 

database/migrations/0000_03_07_190510_create_countries_timezones_table.php

@@ -29,8 +29,6 @@ public function up(): void
 
             $table->string('timezone_name');
             $table->foreign('timezone_name')->references('zone_name')->on(config()->string('atlas.timezones_tablename'));
-
-            $table->unique(['country_id', 'timezone_name']);
         });
     }
 

database/migrations/0000_03_07_190511_upgrade_atlas_schema.php

@@ -11,10 +11,14 @@
 {
     /**
      * Run the migrations.
+     *
+     * Applies all v2 schema changes. Every operation is guarded for
+     * idempotency so this migration is safe on both fresh installs
+     * (where the tables were just created by the original migrations)
+     * and upgrades from v1.x.
      */
     public function up(): void
     {
-        $this->renamePivotColumn();
         $this->renameCountryStringColumns();
         $this->fixRegionIdNullability();
         $this->addMissingIndexes();
@@ -28,36 +32,8 @@ public function down(): void
         // Not reversible: the original CREATE TABLE migrations handle table drops.
     }
 
-    /**
-     * Rename time_zone_name → timezone_name in the country-timezone pivot table.
-     *
-     * Only applies to databases created before the column was renamed in the
-     * original migration file (commit 0258d50).
-     */
-    private function renamePivotColumn(): void
-    {
-        $pivotTable = config()->string('atlas.country_timezone_pivot_tablename');
-
-        if (! Schema::hasTable($pivotTable) || ! Schema::hasColumn($pivotTable, 'time_zone_name')) {
-            return;
-        }
-
-        $timezonesTable = config()->string('atlas.timezones_tablename');
-
-        Schema::table($pivotTable, function (Blueprint $table): void {
-            $table->dropForeign(['time_zone_name']);
-            $table->renameColumn('time_zone_name', 'timezone_name');
-        });
-
-        Schema::table($pivotTable, function (Blueprint $table) use ($timezonesTable): void {
-            $table->foreign('timezone_name')->references('zone_name')->on($timezonesTable);
-        });
-    }
-
     /**
      * Rename region → region_name and subregion → subregion_name on the countries table.
-     *
-     * Only applies to databases created before the columns were renamed.
      */
     private function renameCountryStringColumns(): void
     {
@@ -82,8 +58,6 @@ private function renameCountryStringColumns(): void
 
     /**
      * Make region_id nullable so that nullOnDelete() can work correctly.
-     *
-     * Only applies to databases where region_id was created as NOT NULL.
      */
     private function fixRegionIdNullability(): void
     {
@@ -99,43 +73,7 @@ private function fixRegionIdNullability(): void
     }
 
     /**
-     * Remove duplicate rows from the pivot table so the unique index can be added safely.
-     *
-     * Databases upgraded from v1.x may contain duplicates because the old
-     * TimezonesSeeder had no DB-level uniqueness guarantee. Uses a
-     * database-agnostic approach (temp table + reinsert) since the pivot
-     * has no primary key column.
-     */
-    private function deduplicatePivotRows(string $pivotTable): void
-    {
-        $duplicates = DB::table($pivotTable)
-            ->select('country_id', 'timezone_name')
-            ->groupBy('country_id', 'timezone_name')
-            ->havingRaw('COUNT(*) > 1')
-            ->get();
-
-        if ($duplicates->isEmpty()) {
-            return;
-        }
-
-        // For each duplicate group, delete all rows then re-insert one.
-        foreach ($duplicates as $row) {
-            DB::table($pivotTable)
-                ->where('country_id', $row->country_id)
-                ->where('timezone_name', $row->timezone_name)
-                ->delete();
-
-            DB::table($pivotTable)->insert([
-                'country_id'    => $row->country_id,
-                'timezone_name' => $row->timezone_name,
-            ]);
-        }
-    }
-
-    /**
-     * Add indexes that were added to CREATE TABLE migrations after initial release.
-     *
-     * Only applies to databases created before the indexes were added (commit 7716529).
+     * Add indexes introduced in v2.
      */
     private function addMissingIndexes(): void
     {
@@ -181,4 +119,32 @@ private function addMissingIndexes(): void
             });
         }
     }
+
+    /**
+     * Remove duplicate rows from the pivot table so the unique index can be added safely.
+     */
+    private function deduplicatePivotRows(string $pivotTable): void
+    {
+        $duplicates = DB::table($pivotTable)
+            ->select('country_id', 'timezone_name')
+            ->groupBy('country_id', 'timezone_name')
+            ->havingRaw('COUNT(*) > 1')
+            ->get();
+
+        if ($duplicates->isEmpty()) {
+            return;
+        }
+
+        foreach ($duplicates as $row) {
+            DB::table($pivotTable)
+                ->where('country_id', $row->country_id)
+                ->where('timezone_name', $row->timezone_name)
+                ->delete();
+
+            DB::table($pivotTable)->insert([
+                'country_id'    => $row->country_id,
+                'timezone_name' => $row->timezone_name,
+            ]);
+        }
+    }
 };