Fixes utf8 issues and paths to data files in database scripts.

Author: Sergio Cruz

geonames_import_data.sql

@@ -1,55 +1,55 @@
 SELECT '########## Loading allCountries.txt... ##########';
-LOAD DATA LOCAL INFILE 'allCountries.txt'
+LOAD DATA LOCAL INFILE 'data/allCountries.txt'
 INTO TABLE geoname
 CHARACTER SET 'utf8mb4'
 (geonameid, name, asciiname, alternatenames, latitude, longitude, fclass, fcode, country, cc2, admin1, admin2, admin3, admin4, population, elevation, gtopo30, timezone, moddate);
 
 SELECT '########## Loading alternateNames.txt... ##########';
-LOAD DATA LOCAL INFILE 'alternateNames.txt'
+LOAD DATA LOCAL INFILE 'data/alternateNames.txt'
 INTO TABLE alternatename
 CHARACTER SET 'utf8mb4'
 (alternatenameid, geonameid, isoLanguage, alternateName, isPreferredName, isShortName, isColloquial, isHistoric);
 
 SELECT '########## Loading iso-languagecodes.txt... ##########';
-LOAD DATA LOCAL INFILE 'iso-languagecodes.txt'
+LOAD DATA LOCAL INFILE 'data/iso-languagecodes.txt'
 INTO TABLE iso_languagecodes
 CHARACTER SET 'utf8mb4'
 IGNORE 1 LINES
 (iso_639_3, iso_639_2, iso_639_1, language_name);
 
 SELECT '########## Loading admin1CodesASCII.txt... ##########';
-LOAD DATA LOCAL INFILE 'admin1CodesASCII.txt'
+LOAD DATA LOCAL INFILE 'data/admin1CodesASCII.txt'
 INTO TABLE admin1CodesAscii
 CHARACTER SET 'utf8mb4'
 (code, name, nameAscii, geonameid);
 
 SELECT '########## Loading admin2Codes.txt... ##########';
-LOAD DATA LOCAL INFILE 'admin2Codes.txt'
+LOAD DATA LOCAL INFILE 'data/admin2Codes.txt'
 INTO TABLE admin2Codes
 CHARACTER SET 'utf8mb4'
 (code, name, nameAscii, geonameid);
 
 SELECT '########## Loading hierarchy.txt... ##########';
-LOAD DATA LOCAL INFILE 'hierarchy.txt'
+LOAD DATA LOCAL INFILE 'data/hierarchy.txt'
 INTO TABLE hierarchy
 CHARACTER SET 'utf8mb4'
 (parentId, childId, type);
 
 SELECT '########## Loading featureCodes_en.txt... ##########';
-LOAD DATA LOCAL INFILE 'featureCodes_en.txt'
+LOAD DATA LOCAL INFILE 'data/featureCodes_en.txt'
 INTO TABLE featureCodes
 CHARACTER SET 'utf8mb4'
 (code, name, description);
 
 SELECT '########## Loading timeZones.txt... ##########';
-LOAD DATA LOCAL INFILE 'timeZones.txt'
+LOAD DATA LOCAL INFILE 'data/timeZones.txt'
 INTO TABLE timeZones
 CHARACTER SET 'utf8mb4'
 IGNORE 1 LINES
 (timeZoneId, GMT_offset, DST_offset);
 
 SELECT '########## Loading countryInfo.txt... ##########';
-LOAD DATA LOCAL INFILE 'countryInfo.txt'
+LOAD DATA LOCAL INFILE 'data/countryInfo.txt'
 INTO TABLE countryinfo
 CHARACTER SET 'utf8mb4'
 IGNORE 51 LINES	
@@ -63,7 +63,7 @@ FIELDS TERMINATED BY ','
 (code, name, geonameId);
 
 -- Postal Code Data. Ignore until we are able to download them
--- LOAD DATA LOCAL INFILE 'zip/allCountries.txt'
--- INTO TABLE postalCodes
--- CHARACTER SET 'utf8mb4'
--- (country, postal_code, name, admin1_name, admin1_code, admin2_name, admin2_code, admin3_name, admin3_code, latitude, longitude, accuracy)
+LOAD DATA LOCAL INFILE 'data/zip_codes/allCountries.txt'
+INTO TABLE postalCodes
+CHARACTER SET 'utf8mb4'
+(country, postal_code, name, admin1_name, admin1_code, admin2_name, admin2_code, admin3_name, admin3_code, latitude, longitude, accuracy)

geonames_importer.sh

@@ -208,7 +208,7 @@ case "$action" in
     create-db)
         echo "Creating database $dbname..."
         mysql -h $dbhost -P $dbport -u $dbusername -p$dbpassword -Bse "DROP DATABASE IF EXISTS $dbname;"
-        mysql -h $dbhost -P $dbport -u $dbusername -p$dbpassword -Bse "CREATE DATABASE $dbname DEFAULT CHARACTER SET utf8;" 
+        mysql -h $dbhost -P $dbport -u $dbusername -p$dbpassword -Bse "CREATE DATABASE $dbname DEFAULT CHARACTER SET utf8mb4;" 
         mysql -h $dbhost -P $dbport -u $dbusername -p$dbpassword -Bse "USE $dbname;" 
         mysql -h $dbhost -P $dbport -u $dbusername -p$dbpassword $dbname < "$working_dir/geonames_db_struct.sql"
     ;;