Skip to content

Commit b1cad2f

Browse files
author
Sergio Cruz
committed
Cambio en el encoding de las tablas de la bd a utf8mb4
1 parent ff88545 commit b1cad2f

File tree

2 files changed

+38
-27
lines changed

2 files changed

+38
-27
lines changed

‎geonames_db_struct.sql‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CREATE TABLE `admin1CodesAscii` (
88
KEY `name` (`name`(20)),
99
KEY `nameAscii` (`nameAscii`(20)),
1010
KEY `geonameid` (`geonameid`)
11-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
11+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
1212

1313
-- Create syntax for TABLE 'admin2Codes'
1414
CREATE TABLE `admin2Codes` (
@@ -20,7 +20,7 @@ CREATE TABLE `admin2Codes` (
2020
KEY `name` (`name`(80)),
2121
KEY `nameAscii` (`nameAscii`(80)),
2222
KEY `geonameid` (`geonameid`)
23-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
23+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
2424

2525
-- Create syntax for TABLE 'alternatename'
2626
CREATE TABLE `alternatename` (
@@ -36,7 +36,7 @@ CREATE TABLE `alternatename` (
3636
KEY `geonameid` (`geonameid`),
3737
KEY `isoLanguage` (`isoLanguage`),
3838
KEY `alternateName` (`alternateName`)
39-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
39+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
4040

4141
-- Create syntax for TABLE 'continentCodes'
4242
CREATE TABLE `continentCodes` (
@@ -46,7 +46,7 @@ CREATE TABLE `continentCodes` (
4646
KEY `code` (`code`),
4747
KEY `name` (`name`),
4848
KEY `geonameid` (`geonameid`)
49-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
49+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
5050

5151
-- Create syntax for TABLE 'countryinfo'
5252
CREATE TABLE `countryinfo` (
@@ -74,7 +74,7 @@ CREATE TABLE `countryinfo` (
7474
KEY `iso_numeric` (`iso_numeric`),
7575
KEY `fips_code` (`fips_code`),
7676
KEY `name` (`name`)
77-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
77+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
7878

7979
-- Create syntax for TABLE 'featureCodes'
8080
CREATE TABLE `featureCodes` (
@@ -83,7 +83,7 @@ CREATE TABLE `featureCodes` (
8383
`description` text,
8484
KEY `code` (`code`),
8585
KEY `name` (`name`)
86-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
86+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
8787

8888
-- Create syntax for TABLE 'geoname'
8989
CREATE TABLE `geoname` (
@@ -96,7 +96,7 @@ CREATE TABLE `geoname` (
9696
`fclass` char(1) DEFAULT NULL,
9797
`fcode` varchar(10) DEFAULT NULL,
9898
`country` varchar(2) DEFAULT NULL,
99-
`cc2` varchar(60) DEFAULT NULL,
99+
`cc2` varchar(200) DEFAULT NULL,
100100
`admin1` varchar(20) DEFAULT NULL,
101101
`admin2` varchar(80) DEFAULT NULL,
102102
`admin3` varchar(20) DEFAULT NULL,
@@ -119,7 +119,7 @@ CREATE TABLE `geoname` (
119119
KEY `population` (`population`),
120120
KEY `elevation` (`elevation`),
121121
KEY `timezone` (`timezone`)
122-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
122+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
123123

124124
-- Create syntax for TABLE 'hierarchy'
125125
CREATE TABLE `hierarchy` (
@@ -128,22 +128,22 @@ CREATE TABLE `hierarchy` (
128128
`type` varchar(50) DEFAULT NULL,
129129
KEY `parentId` (`parentId`),
130130
KEY `childId` (`childId`)
131-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
131+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
132132

133133
-- Create syntax for TABLE 'iso_languagecodes'
134134
CREATE TABLE `iso_languagecodes` (
135135
`iso_639_3` char(4) DEFAULT NULL,
136136
`iso_639_2` varchar(50) DEFAULT NULL,
137137
`iso_639_1` varchar(50) DEFAULT NULL,
138138
`language_name` varchar(200) DEFAULT NULL
139-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
139+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
140140

141141
-- Create syntax for TABLE 'timeZones'
142142
CREATE TABLE `timeZones` (
143143
`timeZoneId` varchar(200) DEFAULT NULL,
144144
`GMT_offset` decimal(3,1) DEFAULT NULL,
145145
`DST_offset` decimal(3,1) DEFAULT NULL
146-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
146+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
147147

148148
-- Create syntax for TABLE 'postalCodes'
149149
CREATE TABLE `postalCodes` (
@@ -167,4 +167,4 @@ CREATE TABLE `postalCodes` (
167167
KEY `longitude` (`longitude`),
168168
KEY `admin1_name` (`admin1_name`),
169169
KEY `admin1_code_2` (`admin1_code`)
170-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
170+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;

‎geonames_import_data.sql‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,69 @@
1+
SELECT '########## Loading allCountries.txt... ##########';
12
LOAD DATA LOCAL INFILE 'allCountries.txt'
23
INTO TABLE geoname
3-
CHARACTER SET 'UTF8'
4+
CHARACTER SET 'utf8mb4'
45
(geonameid, name, asciiname, alternatenames, latitude, longitude, fclass, fcode, country, cc2, admin1, admin2, admin3, admin4, population, elevation, gtopo30, timezone, moddate);
56

7+
SELECT '########## Loading alternateNames.txt... ##########';
68
LOAD DATA LOCAL INFILE 'alternateNames.txt'
79
INTO TABLE alternatename
8-
CHARACTER SET 'UTF8'
10+
CHARACTER SET 'utf8mb4'
911
(alternatenameid, geonameid, isoLanguage, alternateName, isPreferredName, isShortName, isColloquial, isHistoric);
1012

13+
SELECT '########## Loading iso-languagecodes.txt... ##########';
1114
LOAD DATA LOCAL INFILE 'iso-languagecodes.txt'
1215
INTO TABLE iso_languagecodes
13-
CHARACTER SET 'UTF8'
16+
CHARACTER SET 'utf8mb4'
1417
IGNORE 1 LINES
1518
(iso_639_3, iso_639_2, iso_639_1, language_name);
1619

20+
SELECT '########## Loading admin1CodesASCII.txt... ##########';
1721
LOAD DATA LOCAL INFILE 'admin1CodesASCII.txt'
1822
INTO TABLE admin1CodesAscii
19-
CHARACTER SET 'UTF8'
23+
CHARACTER SET 'utf8mb4'
2024
(code, name, nameAscii, geonameid);
2125

26+
SELECT '########## Loading admin2Codes.txt... ##########';
2227
LOAD DATA LOCAL INFILE 'admin2Codes.txt'
2328
INTO TABLE admin2Codes
24-
CHARACTER SET 'UTF8'
29+
CHARACTER SET 'utf8mb4'
2530
(code, name, nameAscii, geonameid);
2631

32+
SELECT '########## Loading hierarchy.txt... ##########';
2733
LOAD DATA LOCAL INFILE 'hierarchy.txt'
2834
INTO TABLE hierarchy
29-
CHARACTER SET 'UTF8'
35+
CHARACTER SET 'utf8mb4'
3036
(parentId, childId, type);
3137

38+
SELECT '########## Loading featureCodes_en.txt... ##########';
3239
LOAD DATA LOCAL INFILE 'featureCodes_en.txt'
3340
INTO TABLE featureCodes
34-
CHARACTER SET 'UTF8'
41+
CHARACTER SET 'utf8mb4'
3542
(code, name, description);
3643

44+
SELECT '########## Loading timeZones.txt... ##########';
3745
LOAD DATA LOCAL INFILE 'timeZones.txt'
3846
INTO TABLE timeZones
39-
CHARACTER SET 'UTF8'
47+
CHARACTER SET 'utf8mb4'
4048
IGNORE 1 LINES
4149
(timeZoneId, GMT_offset, DST_offset);
4250

51+
SELECT '########## Loading countryInfo.txt... ##########';
4352
LOAD DATA LOCAL INFILE 'countryInfo.txt'
4453
INTO TABLE countryinfo
45-
CHARACTER SET 'UTF8'
46-
IGNORE 51 LINES
54+
CHARACTER SET 'utf8mb4'
55+
IGNORE 51 LINES
4756
(iso_alpha2, iso_alpha3, iso_numeric, fips_code, name, capital, areaInSqKm, population, continent, tld, currency, currencyName, phone, postalCodeFormat, postalCodeRegex, languages, geonameid, neighbours, equivalentFipsCode);
4857

58+
SELECT '########## Loading continentCodes.txt... ##########';
4959
LOAD DATA LOCAL INFILE 'continentCodes.txt'
5060
INTO TABLE continentCodes
51-
CHARACTER SET 'UTF8'
61+
CHARACTER SET 'utf8mb4'
5262
FIELDS TERMINATED BY ','
5363
(code, name, geonameId);
5464

55-
LOAD DATA LOCAL INFILE 'zip/allCountries.txt'
56-
INTO TABLE postalCodes
57-
CHARACTER SET 'UTF8'
58-
(country, postal_code, name, admin1_name, admin1_code, admin2_name, admin2_code, admin3_name, admin3_code, latitude, longitude, accuracy)
65+
-- Postal Code Data. Ignore until we are able to download them
66+
-- LOAD DATA LOCAL INFILE 'zip/allCountries.txt'
67+
-- INTO TABLE postalCodes
68+
-- CHARACTER SET 'utf8mb4'
69+
-- (country, postal_code, name, admin1_name, admin1_code, admin2_name, admin2_code, admin3_name, admin3_code, latitude, longitude, accuracy)

0 commit comments

Comments
 (0)