feat: update export script

dr5hn · Sep 3, 2023 · 8fa597a · 8fa597a
1 parent 854ba4c
commit 8fa597a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/export.yml b/.github/workflows/export.yml
@@ -38,6 +38,7 @@ jobs:
         run: |
           grep -v "DROP TABLE" sql/world.sql > tmpfile && mv tmpfile sql/world.sql
           echo -e "DROP TABLE IF EXISTS \`regions\`;\n\n$(cat sql/world.sql)" > sql/world.sql
+          echo -e "DROP TABLE IF EXISTS \`subregions\`;\n\n$(cat sql/world.sql)" > sql/world.sql
           echo -e "DROP TABLE IF EXISTS \`countries\`;\n$(cat sql/world.sql)" > sql/world.sql
           echo -e "DROP TABLE IF EXISTS \`states\`;\n$(cat sql/world.sql)" > sql/world.sql
           echo -e "DROP TABLE IF EXISTS \`cities\`;\n$(cat sql/world.sql)" > sql/world.sql
@@ -60,6 +61,7 @@ jobs:
           php scripts/export_yaml.php
           php scripts/export_csv.php
           mysqldump -uroot -proot --add-drop-table --disable-keys --set-charset --skip-add-locks world regions > sql/regions.sql
+          mysqldump -uroot -proot --add-drop-table --disable-keys --set-charset --skip-add-locks world subregions > sql/subregions.sql
           mysqldump -uroot -proot --add-drop-table --disable-keys --set-charset --skip-add-locks world countries > sql/countries.sql
           mysqldump -uroot -proot --add-drop-table --disable-keys --set-charset --skip-add-locks world states > sql/states.sql
           mysqldump -uroot -proot --add-drop-table --disable-keys --set-charset --skip-add-locks world cities > sql/cities.sql

diff --git a/scripts/export.php b/scripts/export.php
@@ -42,7 +42,9 @@
         $countriesArray[$m]['tld'] = $row['tld'];
         $countriesArray[$m]['native'] = $row['native'];
         $countriesArray[$m]['region'] = $row['region'];
+        $countriesArray[$m]['region_id'] = $row['region_id'];
         $countriesArray[$m]['subregion'] = $row['subregion'];
+        $countriesArray[$m]['subregion_id'] = $row['subregion_id'];
         $countriesArray[$m]['nationality'] = $row['nationality'];
         $countriesArray[$m]['timezones'] = json_decode($row['timezones'], true);
         $countriesArray[$m]['translations'] = json_decode($row['translations'], true);
@@ -72,7 +74,9 @@
     $countryStateCityArray[$k]['tld'] = $country['tld'];
     $countryStateCityArray[$k]['native'] = $country['native'];
     $countryStateCityArray[$k]['region'] = $country['region'];
+    $countryStateCityArray[$k]['region_id'] = $country['region_id'];
     $countryStateCityArray[$k]['subregion'] = $country['subregion'];
+    $countryStateCityArray[$k]['subregion_id'] = $country['subregion_id'];
     $countryStateCityArray[$k]['nationality'] = $country['nationality'];
     $countryStateCityArray[$k]['timezones'] = $country['timezones'];
     $countryStateCityArray[$k]['translations'] = $country['translations'];