Skip to content

Commit b5900aa

Browse files
author
Sergio Cruz Moral
committed
Merge pull request #18 from mrzard/patch-1
Set tables collation to utf8_unicode_ci
2 parents a9eb55e + c911257 commit b5900aa

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

geonames_db_struct.sql

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- DROP DATABASE IF EXISTS geonames;
2-
-- CREATE DATABASE geonames DEFAULT CHARACTER SET utf8;
2+
-- CREATE DATABASE geonames DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
33
-- USE geonames;
44

55
-- Create syntax for TABLE 'admin1CodesAscii'
@@ -12,7 +12,7 @@ CREATE TABLE `admin1CodesAscii` (
1212
KEY `name` (`name`(20)),
1313
KEY `nameAscii` (`nameAscii`(20)),
1414
KEY `geonameid` (`geonameid`)
15-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
15+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
1616

1717
-- Create syntax for TABLE 'admin2Codes'
1818
CREATE TABLE `admin2Codes` (
@@ -24,7 +24,7 @@ CREATE TABLE `admin2Codes` (
2424
KEY `name` (`name`(80)),
2525
KEY `nameAscii` (`nameAscii`(80)),
2626
KEY `geonameid` (`geonameid`)
27-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
27+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
2828

2929
-- Create syntax for TABLE 'alternatename'
3030
CREATE TABLE `alternatename` (
@@ -40,7 +40,7 @@ CREATE TABLE `alternatename` (
4040
KEY `geonameid` (`geonameid`),
4141
KEY `isoLanguage` (`isoLanguage`),
4242
KEY `alternateName` (`alternateName`)
43-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
43+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
4444

4545
-- Create syntax for TABLE 'continentCodes'
4646
CREATE TABLE `continentCodes` (
@@ -50,7 +50,7 @@ CREATE TABLE `continentCodes` (
5050
KEY `code` (`code`),
5151
KEY `name` (`name`),
5252
KEY `geonameid` (`geonameid`)
53-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
53+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
5454

5555
-- Create syntax for TABLE 'countryinfo'
5656
CREATE TABLE `countryinfo` (
@@ -78,7 +78,7 @@ CREATE TABLE `countryinfo` (
7878
KEY `iso_numeric` (`iso_numeric`),
7979
KEY `fips_code` (`fips_code`),
8080
KEY `name` (`name`)
81-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
81+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
8282

8383
-- Create syntax for TABLE 'featureCodes'
8484
CREATE TABLE `featureCodes` (
@@ -87,7 +87,7 @@ CREATE TABLE `featureCodes` (
8787
`description` text,
8888
KEY `code` (`code`),
8989
KEY `name` (`name`)
90-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
90+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
9191

9292
-- Create syntax for TABLE 'geoname'
9393
CREATE TABLE `geoname` (
@@ -123,7 +123,7 @@ CREATE TABLE `geoname` (
123123
KEY `population` (`population`),
124124
KEY `elevation` (`elevation`),
125125
KEY `timezone` (`timezone`)
126-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
126+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
127127

128128
-- Create syntax for TABLE 'hierarchy'
129129
CREATE TABLE `hierarchy` (
@@ -132,22 +132,22 @@ CREATE TABLE `hierarchy` (
132132
`type` varchar(50) DEFAULT NULL,
133133
KEY `parentId` (`parentId`),
134134
KEY `childId` (`childId`)
135-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
135+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
136136

137137
-- Create syntax for TABLE 'iso_languagecodes'
138138
CREATE TABLE `iso_languagecodes` (
139139
`iso_639_3` char(4) DEFAULT NULL,
140140
`iso_639_2` varchar(50) DEFAULT NULL,
141141
`iso_639_1` varchar(50) DEFAULT NULL,
142142
`language_name` varchar(200) DEFAULT NULL
143-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
143+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
144144

145145
-- Create syntax for TABLE 'timeZones'
146146
CREATE TABLE `timeZones` (
147147
`timeZoneId` varchar(200) DEFAULT NULL,
148148
`GMT_offset` decimal(3,1) DEFAULT NULL,
149149
`DST_offset` decimal(3,1) DEFAULT NULL
150-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
150+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;
151151

152152
-- Create syntax for TABLE 'postalCodes'
153153
CREATE TABLE `postalCodes` (
@@ -171,4 +171,4 @@ CREATE TABLE `postalCodes` (
171171
KEY `longitude` (`longitude`),
172172
KEY `admin1_name` (`admin1_name`),
173173
KEY `admin1_code_2` (`admin1_code`)
174-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
174+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;

0 commit comments

Comments
 (0)