From 093fb8fe39d03544d402805068cafea5ae39a29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Mart=C3=ADn?= Date: Tue, 6 Mar 2018 16:09:59 +0100 Subject: [PATCH 1/5] Copy South Sudan rows using ISO codes --- .../admin0/patches/20180306_add_ssd_rows_for_south_sudan.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 geocoder/admin0/patches/20180306_add_ssd_rows_for_south_sudan.sql diff --git a/geocoder/admin0/patches/20180306_add_ssd_rows_for_south_sudan.sql b/geocoder/admin0/patches/20180306_add_ssd_rows_for_south_sudan.sql new file mode 100644 index 0000000..66d02cc --- /dev/null +++ b/geocoder/admin0/patches/20180306_add_ssd_rows_for_south_sudan.sql @@ -0,0 +1 @@ +insert into admin0_synonyms (name, rank, adm0_a3, name_) select name, rank, 'SSD' as adm0_a3, name_ from admin0_synonyms where adm0_a3 = 'SDS'; From 25a2cf2483cade3b4c9fe41d6a158b853cc16b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Mart=C3=ADn?= Date: Tue, 6 Mar 2018 16:15:31 +0100 Subject: [PATCH 2/5] Add patch to downloader script --- geocoder/geocoder_download_patches.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/geocoder/geocoder_download_patches.sh b/geocoder/geocoder_download_patches.sh index dce4e1a..b7fb59b 100644 --- a/geocoder/geocoder_download_patches.sh +++ b/geocoder/geocoder_download_patches.sh @@ -7,7 +7,8 @@ VERSION=0.0.1 PATCHES_LIST="20160203_countries_bh_isocode.sql 20160622_countries_synonym_congo.sql 20171004_merge_corsica_and_france.sql -20180117_hsinchu_synonyms.sql" +20180117_hsinchu_synonyms.sql +20180306_add_ssd_rows_for_south_sudan.sql" mkdir -p $TARGET_DIR_PATCHES From a6c118ceb0c8e84cd2312a48499e3c57069cde4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Mart=C3=ADn?= Date: Tue, 6 Mar 2018 18:09:45 +0100 Subject: [PATCH 3/5] Prevent from updating more than once --- .../patches/20180306_add_ssd_rows_for_south_sudan.sql | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/geocoder/admin0/patches/20180306_add_ssd_rows_for_south_sudan.sql b/geocoder/admin0/patches/20180306_add_ssd_rows_for_south_sudan.sql index 66d02cc..09a6e4a 100644 --- a/geocoder/admin0/patches/20180306_add_ssd_rows_for_south_sudan.sql +++ b/geocoder/admin0/patches/20180306_add_ssd_rows_for_south_sudan.sql @@ -1 +1,8 @@ -insert into admin0_synonyms (name, rank, adm0_a3, name_) select name, rank, 'SSD' as adm0_a3, name_ from admin0_synonyms where adm0_a3 = 'SDS'; +DO $$ + DECLARE updated INTEGER; +BEGIN + SELECT count(*) FROM admin0_synonyms WHERE adm0_a3 = 'SSD' INTO updated + IF updated = 0 THEN + INSERT INTO admin0_synonyms (name, rank, adm0_a3, name_) SELECT name, rank, 'SSD' AS adm0_a3, name_ FROM admin0_synonyms WHERE adm0_a3 = 'SDS'; + END IF; +END From 0e21c4bed34445e4bc32d1e63950297284264856 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Tue, 6 Mar 2018 18:44:43 +0100 Subject: [PATCH 4/5] Missing admin0 patches that were in S3 only --- geocoder/admin0/patches/20160203_countries_bh_isocode.sql | 3 +++ geocoder/admin0/patches/20160622_countries_synonym_congo.sql | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 geocoder/admin0/patches/20160203_countries_bh_isocode.sql create mode 100644 geocoder/admin0/patches/20160622_countries_synonym_congo.sql diff --git a/geocoder/admin0/patches/20160203_countries_bh_isocode.sql b/geocoder/admin0/patches/20160203_countries_bh_isocode.sql new file mode 100644 index 0000000..c7c5635 --- /dev/null +++ b/geocoder/admin0/patches/20160203_countries_bh_isocode.sql @@ -0,0 +1,3 @@ +-- Patch 0.0.1 data version -20160203 + +DELETE FROM admin0_synonyms WHERE rank = 8 AND char_length(name_) < 4; diff --git a/geocoder/admin0/patches/20160622_countries_synonym_congo.sql b/geocoder/admin0/patches/20160622_countries_synonym_congo.sql new file mode 100644 index 0000000..7b29e0d --- /dev/null +++ b/geocoder/admin0/patches/20160622_countries_synonym_congo.sql @@ -0,0 +1,3 @@ +-- Patch 0.0.1 data version -20160622 + +INSERT INTO admin0_synonyms (name, rank, adm0_a3) VALUES ('Republic of the Congo', 10, 'COG'); \ No newline at end of file From a468a01d9ca0fe7e751b58d7ffd0bc980e006085 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Tue, 6 Mar 2018 18:46:57 +0100 Subject: [PATCH 5/5] Make the patch ideompotent --- .../patches/20160622_countries_synonym_congo.sql | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/geocoder/admin0/patches/20160622_countries_synonym_congo.sql b/geocoder/admin0/patches/20160622_countries_synonym_congo.sql index 7b29e0d..77bc40f 100644 --- a/geocoder/admin0/patches/20160622_countries_synonym_congo.sql +++ b/geocoder/admin0/patches/20160622_countries_synonym_congo.sql @@ -1,3 +1,9 @@ -- Patch 0.0.1 data version -20160622 - -INSERT INTO admin0_synonyms (name, rank, adm0_a3) VALUES ('Republic of the Congo', 10, 'COG'); \ No newline at end of file +DO $$ + DECLARE exiting INTEGER; +BEGIN + SELECT count(*) FROM admin0_synonyms WHERE name = 'Republic of the Congo' AND adm0_a3 = 'COG' and rank = 10 INTO exiting; + IF exiting = 0 THEN + INSERT INTO admin0_synonyms (name, rank, adm0_a3) VALUES ('Republic of the Congo', 10, 'COG'); + END IF; +END$$;