Skip to content

Commit 68cbdcf

Browse files
author
Sergio Cruz
committed
Merge remote-tracking branch 'origin/2.0'
2 parents 9cdfd89 + 7b6d32c commit 68cbdcf

File tree

3 files changed

+164
-115
lines changed

3 files changed

+164
-115
lines changed

‎geonames_db_struct.sql‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
-- DROP DATABASE IF EXISTS geonames;
2-
-- CREATE DATABASE geonames DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
3-
-- USE geonames;
4-
51
-- Create syntax for TABLE 'admin1CodesAscii'
62
CREATE TABLE `admin1CodesAscii` (
73
`code` char(15) DEFAULT NULL,
@@ -12,7 +8,7 @@ CREATE TABLE `admin1CodesAscii` (
128
KEY `name` (`name`(20)),
139
KEY `nameAscii` (`nameAscii`(20)),
1410
KEY `geonameid` (`geonameid`)
15-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
11+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
1612

1713
-- Create syntax for TABLE 'admin2Codes'
1814
CREATE TABLE `admin2Codes` (
@@ -24,7 +20,7 @@ CREATE TABLE `admin2Codes` (
2420
KEY `name` (`name`(80)),
2521
KEY `nameAscii` (`nameAscii`(80)),
2622
KEY `geonameid` (`geonameid`)
27-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
23+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
2824

2925
-- Create syntax for TABLE 'alternatename'
3026
CREATE TABLE `alternatename` (
@@ -40,7 +36,7 @@ CREATE TABLE `alternatename` (
4036
KEY `geonameid` (`geonameid`),
4137
KEY `isoLanguage` (`isoLanguage`),
4238
KEY `alternateName` (`alternateName`)
43-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
39+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
4440

4541
-- Create syntax for TABLE 'continentCodes'
4642
CREATE TABLE `continentCodes` (
@@ -50,7 +46,7 @@ CREATE TABLE `continentCodes` (
5046
KEY `code` (`code`),
5147
KEY `name` (`name`),
5248
KEY `geonameid` (`geonameid`)
53-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
49+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
5450

5551
-- Create syntax for TABLE 'countryinfo'
5652
CREATE TABLE `countryinfo` (
@@ -78,7 +74,7 @@ CREATE TABLE `countryinfo` (
7874
KEY `iso_numeric` (`iso_numeric`),
7975
KEY `fips_code` (`fips_code`),
8076
KEY `name` (`name`)
81-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
77+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
8278

8379
-- Create syntax for TABLE 'featureCodes'
8480
CREATE TABLE `featureCodes` (
@@ -87,7 +83,7 @@ CREATE TABLE `featureCodes` (
8783
`description` text,
8884
KEY `code` (`code`),
8985
KEY `name` (`name`)
90-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
86+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
9187

9288
-- Create syntax for TABLE 'geoname'
9389
CREATE TABLE `geoname` (
@@ -100,7 +96,7 @@ CREATE TABLE `geoname` (
10096
`fclass` char(1) DEFAULT NULL,
10197
`fcode` varchar(10) DEFAULT NULL,
10298
`country` varchar(2) DEFAULT NULL,
103-
`cc2` varchar(60) DEFAULT NULL,
99+
`cc2` varchar(200) DEFAULT NULL,
104100
`admin1` varchar(20) DEFAULT NULL,
105101
`admin2` varchar(80) DEFAULT NULL,
106102
`admin3` varchar(20) DEFAULT NULL,
@@ -123,7 +119,7 @@ CREATE TABLE `geoname` (
123119
KEY `population` (`population`),
124120
KEY `elevation` (`elevation`),
125121
KEY `timezone` (`timezone`)
126-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
122+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
127123

128124
-- Create syntax for TABLE 'hierarchy'
129125
CREATE TABLE `hierarchy` (
@@ -132,22 +128,22 @@ CREATE TABLE `hierarchy` (
132128
`type` varchar(50) DEFAULT NULL,
133129
KEY `parentId` (`parentId`),
134130
KEY `childId` (`childId`)
135-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
131+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
136132

137133
-- Create syntax for TABLE 'iso_languagecodes'
138134
CREATE TABLE `iso_languagecodes` (
139135
`iso_639_3` char(4) DEFAULT NULL,
140136
`iso_639_2` varchar(50) DEFAULT NULL,
141137
`iso_639_1` varchar(50) DEFAULT NULL,
142138
`language_name` varchar(200) DEFAULT NULL
143-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
139+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
144140

145141
-- Create syntax for TABLE 'timeZones'
146142
CREATE TABLE `timeZones` (
147143
`timeZoneId` varchar(200) DEFAULT NULL,
148144
`GMT_offset` decimal(3,1) DEFAULT NULL,
149145
`DST_offset` decimal(3,1) DEFAULT NULL
150-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
146+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
151147

152148
-- Create syntax for TABLE 'postalCodes'
153149
CREATE TABLE `postalCodes` (
@@ -171,4 +167,4 @@ CREATE TABLE `postalCodes` (
171167
KEY `longitude` (`longitude`),
172168
KEY `admin1_name` (`admin1_name`),
173169
KEY `admin1_code_2` (`admin1_code`)
174-
) 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: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,69 @@
1-
LOAD DATA LOCAL INFILE 'allCountries.txt'
1+
SELECT '########## Loading allCountries.txt... ##########';
2+
LOAD DATA LOCAL INFILE 'data/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

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

11-
LOAD DATA LOCAL INFILE 'iso-languagecodes.txt'
13+
SELECT '########## Loading iso-languagecodes.txt... ##########';
14+
LOAD DATA LOCAL INFILE 'data/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

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

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

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

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

37-
LOAD DATA LOCAL INFILE 'timeZones.txt'
44+
SELECT '########## Loading timeZones.txt... ##########';
45+
LOAD DATA LOCAL INFILE 'data/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

43-
LOAD DATA LOCAL INFILE 'countryInfo.txt'
51+
SELECT '########## Loading countryInfo.txt... ##########';
52+
LOAD DATA LOCAL INFILE 'data/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'
65+
-- Postal Code Data. Ignore until we are able to download them
66+
LOAD DATA LOCAL INFILE 'data/zip_codes/allCountries.txt'
5667
INTO TABLE postalCodes
57-
CHARACTER SET 'UTF8'
68+
CHARACTER SET 'utf8mb4'
5869
(country, postal_code, name, admin1_name, admin1_code, admin2_name, admin2_code, admin3_name, admin3_code, latitude, longitude, accuracy)

0 commit comments

Comments
 (0)