From 89be80e0fd378d09931f09d1a7260dfa5384acf4 Mon Sep 17 00:00:00 2001 From: Christopher Rosset Date: Thu, 22 Jun 2023 21:22:49 -0400 Subject: [PATCH 1/3] SQL updates for the `planes` table This updates `create.sql` with the schema changes that were brought in through `clean-duplicate-planes.sql` in https://github.com/jpatokal/openflights/commit/36b3ee9d5c087e38f9011c9c338a37f7ddb06ee2. Additionally, this updates `load-data.sql` to seed the DB with the data present in `data/planes.dat`. Resolves #1210. --- sql/clean-duplicate-planes.sql | 2 +- sql/create.sql | 10 ++++++++-- sql/load-data.sql | 8 ++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) 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..c6ce39bf 100644 --- a/sql/create.sql +++ b/sql/create.sql @@ -1,5 +1,7 @@ +DROP DATABASE IF EXISTS flightdb2; CREATE DATABASE flightdb2; +DROP USER IF EXISTS openflights@localhost; CREATE USER openflights@localhost; GRANT ALL PRIVILEGES ON flightdb2.* TO openflights@localhost; @@ -155,12 +157,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`) + `iata` text default NULL, + `icao` text default NULL, + `frequency` int 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' From 33a81b8fa6646ae792028310e1f9a4b620a58eb5 Mon Sep 17 00:00:00 2001 From: Christopher Rosset Date: Wed, 28 Jun 2023 21:04:14 -0400 Subject: [PATCH 2/3] Updates to match live schema Reference https://github.com/jpatokal/openflights/pull/1211#issuecomment-1611082699. --- sql/create.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/create.sql b/sql/create.sql index c6ce39bf..58b69af6 100644 --- a/sql/create.sql +++ b/sql/create.sql @@ -161,10 +161,10 @@ CREATE TABLE `planes` ( `abbr` text, `speed` double default NULL, `plid` int(11) NOT NULL auto_increment, - `public` char(1) default NULL, + `public` char(1) default 'N', `iata` text default NULL, `icao` text default NULL, - `frequency` int default 0, + `frequency` int(11) default 0, PRIMARY KEY (`plid`), UNIQUE KEY `name` (`name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; From 760d33968bb0b40e8443baca77e3eddbfe7c7faa Mon Sep 17 00:00:00 2001 From: Christopher Rosset Date: Sat, 8 Jul 2023 12:54:14 -0400 Subject: [PATCH 3/3] Review updates --- sql/create.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/sql/create.sql b/sql/create.sql index 58b69af6..65b8f50c 100644 --- a/sql/create.sql +++ b/sql/create.sql @@ -1,7 +1,5 @@ -DROP DATABASE IF EXISTS flightdb2; CREATE DATABASE flightdb2; -DROP USER IF EXISTS openflights@localhost; CREATE USER openflights@localhost; GRANT ALL PRIVILEGES ON flightdb2.* TO openflights@localhost;