From 325cb004c047701c8d491deeaec2ddad73cd8f2e Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Fri, 23 Oct 2015 14:32:08 +0200 Subject: [PATCH] Add another test for the synonyms --- geocoder/admin0/extension/.gitignore | 2 ++ .../expected/cdb_geocoder_admin0_test.out | 17 +++++++++++++++++ .../extension/sql/cdb_geocoder_admin0_test.sql | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/geocoder/admin0/extension/.gitignore b/geocoder/admin0/extension/.gitignore index fbca225..e710f0e 100644 --- a/geocoder/admin0/extension/.gitignore +++ b/geocoder/admin0/extension/.gitignore @@ -1 +1,3 @@ results/ +regression.diffs +regression.out diff --git a/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out b/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out index 92a15ff..c6e846c 100644 --- a/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out +++ b/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out @@ -20,3 +20,20 @@ SELECT (geocode_admin0_polygons(Array['Spain', 'USA', ''])).*; USA | | f (3 rows) +-- Mock the varnish invalidation function +CREATE OR REPLACE FUNCTION public.cdb_invalidate_varnish(table_name text) RETURNS void AS $$ +BEGIN + RETURN; +END +$$ +LANGUAGE plpgsql; +-- Add a few synonyms +COPY admin0_synonyms (name, rank, created_at, updated_at, the_geom, the_geom_webmercator, cartodb_id, adm0_a3, name_) FROM stdin; +-- Check that the synonym function is callable, should return their iso codes +SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*; + q | adm0_a3 +---------------+--------- + ESP | ESP + United States | USA +(2 rows) + diff --git a/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql b/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql index e782008..4a9916f 100644 --- a/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql +++ b/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql @@ -9,3 +9,21 @@ SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*; -- Check that the geocoding function is callable, should return success = false SELECT (geocode_admin0_polygons(Array['Spain', 'USA', ''])).*; + +-- Mock the varnish invalidation function +CREATE OR REPLACE FUNCTION public.cdb_invalidate_varnish(table_name text) RETURNS void AS $$ +BEGIN + RETURN; +END +$$ +LANGUAGE plpgsql; + +-- Add a few synonyms +COPY admin0_synonyms (name, rank, created_at, updated_at, the_geom, the_geom_webmercator, cartodb_id, adm0_a3, name_) FROM stdin; +United States 0 2014-09-30 10:13:28.383426+00 2014-09-30 10:13:28.383426+00 \N \N 29614 USA unitedstates +ESP 3 2014-09-30 10:13:28.383426+00 2014-09-30 10:13:28.383426+00 \N \N 30146 ESP esp +Wallis-et-Futuna 2 2014-09-30 10:13:28.383426+00 2014-09-30 10:13:28.383426+00 \N \N 30013 \N wallisetfutuna +\. + +-- Check that the synonym function is callable, should return their iso codes +SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*;