diff --git a/sql/clean-duplicate-planes.sql b/sql/clean-duplicate-planes.sql index 348dbfba..6b5e2f0b 100644 --- a/sql/clean-duplicate-planes.sql +++ b/sql/clean-duplicate-planes.sql @@ -7,7 +7,7 @@ select name, min(plid), max(plid), count(*) as dupes from planes GROUP BY name h -- Find exact dupes drop table if exists tmp_planes_duplicates; -create table tmp_planes_duplicates (plid int, duplicate_of int) +create table tmp_planes_duplicates (plid int, duplicate_of int); insert into tmp_planes_duplicates select p1.plid, min(p2.plid) as duplicate_of from planes p1, planes p2 diff --git a/sql/create.sql b/sql/create.sql index 631a6290..65b8f50c 100644 --- a/sql/create.sql +++ b/sql/create.sql @@ -155,12 +155,16 @@ CREATE TABLE `locales` ( DROP TABLE IF EXISTS `planes`; CREATE TABLE `planes` ( - `name` text, + `name` varchar(80), `abbr` text, `speed` double default NULL, `plid` int(11) NOT NULL auto_increment, - `public` char(1) default NULL, - PRIMARY KEY (`plid`) + `public` char(1) default 'N', + `iata` text default NULL, + `icao` text default NULL, + `frequency` int(11) default 0, + PRIMARY KEY (`plid`), + UNIQUE KEY `name` (`name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `routes`; diff --git a/sql/load-data.sql b/sql/load-data.sql index c9eb2a9f..c03cf766 100644 --- a/sql/load-data.sql +++ b/sql/load-data.sql @@ -34,6 +34,14 @@ OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\n' (name, iso_code, dafif_code); +\! echo Importing planes... +LOAD DATA LOCAL INFILE 'data/planes.dat' +REPLACE INTO TABLE planes +FIELDS TERMINATED BY ',' +OPTIONALLY ENCLOSED BY '"' +LINES TERMINATED BY '\n' +(name, iata, icao); + \! echo Importing locales... LOAD DATA LOCAL INFILE 'locale/locales.dat'