From 8f5824f5b0b6845012430f8bf902cfc835b74c37 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Wed, 21 Oct 2015 11:27:40 +0200
Subject: [PATCH 01/11] Add missing admin0_synonyms definition

---
 geocoder/admin0/sql/admin0_synonyms.sql | 72 +++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 geocoder/admin0/sql/admin0_synonyms.sql

diff --git a/geocoder/admin0/sql/admin0_synonyms.sql b/geocoder/admin0/sql/admin0_synonyms.sql
new file mode 100644
index 0000000..b593b1a
--- /dev/null
+++ b/geocoder/admin0/sql/admin0_synonyms.sql
@@ -0,0 +1,72 @@
+CREATE TABLE admin0_synonyms (
+    name text,
+    rank double precision,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    the_geom geometry(Geometry,4326),
+    the_geom_webmercator geometry(Geometry,3857),
+    cartodb_id integer NOT NULL,
+    adm0_a3 text,
+    name_ text
+);
+
+CREATE SEQUENCE admin0_synonyms_cartodb_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE admin0_synonyms_cartodb_id_seq OWNED BY admin0_synonyms.cartodb_id;
+
+
+ALTER TABLE ONLY admin0_synonyms ALTER COLUMN cartodb_id SET DEFAULT nextval('admin0_synonyms_cartodb_id_seq'::regclass);
+
+
+ALTER TABLE ONLY admin0_synonyms
+    ADD CONSTRAINT admin0_synonyms_cartodb_id_key UNIQUE (cartodb_id);
+
+
+ALTER TABLE ONLY admin0_synonyms
+    ADD CONSTRAINT admin0_synonyms_pkey PRIMARY KEY (cartodb_id);
+
+
+CREATE INDEX admin0_synonyms_the_geom_idx ON admin0_synonyms USING gist (the_geom);
+
+
+CREATE INDEX admin0_synonyms_the_geom_webmercator_idx ON admin0_synonyms USING gist (the_geom_webmercator);
+
+
+CREATE INDEX idx_admin0_synonyms_nam ON admin0_synonyms USING btree (name);
+
+
+CREATE INDEX idx_admin0_synonyms_name ON admin0_synonyms USING btree (lower(regexp_replace(name, '\W+'::text, ''::text)));
+
+
+CREATE INDEX idx_admin0_synonyms_name_ ON admin0_synonyms USING btree (name_);
+
+
+CREATE INDEX idx_admin0_synonyms_name_patt ON admin0_synonyms USING btree (name_ text_pattern_ops);
+
+CREATE INDEX idx_admin0_synonyms_name_rank ON admin0_synonyms USING btree (name_, rank);
+
+
+
+CREATE INDEX idx_admin0_synonyms_rank ON admin0_synonyms USING btree (rank);
+
+
+
+CREATE TRIGGER admin0_synonyms_name_update BEFORE INSERT OR UPDATE OF name ON admin0_synonyms FOR EACH ROW EXECUTE PROCEDURE alpha_numeric_identifiers();
+
+
+
+CREATE TRIGGER track_updates AFTER INSERT OR DELETE OR UPDATE OR TRUNCATE ON admin0_synonyms FOR EACH STATEMENT EXECUTE PROCEDURE cartodb.cdb_tablemetadata_trigger();
+
+
+
+CREATE TRIGGER update_the_geom_webmercator_trigger BEFORE INSERT OR UPDATE OF the_geom ON admin0_synonyms FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_the_geom_webmercator();
+
+
+CREATE TRIGGER update_updated_at_trigger BEFORE UPDATE ON admin0_synonyms FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_updated_at();
+

From f6fdb762bc878d137b117c2c00ece6230be74ca6 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Wed, 21 Oct 2015 16:32:58 +0200
Subject: [PATCH 02/11] Some small modifications to test script

that let me run tests against dev environment.
---
 geocoder/admin0/test/run.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/geocoder/admin0/test/run.sh b/geocoder/admin0/test/run.sh
index 2fff134..7b87cc3 100644
--- a/geocoder/admin0/test/run.sh
+++ b/geocoder/admin0/test/run.sh
@@ -10,14 +10,16 @@ source functions/test.sh
 # SQL_API_ROUTE and API_KEY need to be
 # conveniently filled for the requests
 # to work.
-# Example: bash run.sh api sql_api_route api_key test_type
+# Syntax: bash run.sh api sql_api_route api_key test_type
+# E.g: bash run.sh api http://development.localhost.lan:8080/api/v1 916f4c31aaa35d6b867dae9a7f54270d functions
 #
 # SQL
 # ====================================
 # It is expected that you run this script
 # as a PostgreSQL superuser, for example:
 #
-# bash run.sh db database role test_type
+# Syntax: bash run.sh db database role test_type
+# E.g: bash run.sh db cartodb_dev_user_fe3b850a-01c0-48f9-8a26-a82f09e9b53f_db postgres data
 #
 # test_type defines the kind of tests to run: data or functions
 
@@ -52,7 +54,7 @@ function sql() {
     then
     # SQL API mode
      	echo $QUERY 
-    	RESULT=$(curl -s -X POST "https://$SQL_API_ROUTE/sql?api_key=$API_KEY&format=csv" --data-urlencode "q=$QUERY" |tail -n1 | tr -d '\r')
+    	RESULT=$(curl -s -X POST "$SQL_API_ROUTE/sql?api_key=$API_KEY&format=csv" --data-urlencode "q=$QUERY" |tail -n1 | tr -d '\r')
     	if [[ "$2" == "should" ]]
     	then
        		if [[ "${RESULT}" != "$3" ]]

From 55518bfa2b601fbfd3db1a4a93f32dff3424e048 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Wed, 21 Oct 2015 17:53:05 +0200
Subject: [PATCH 03/11] Make tests compatible with pg bool output

---
 geocoder/admin0/test/run.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/geocoder/admin0/test/run.sh b/geocoder/admin0/test/run.sh
index 7b87cc3..89c96ef 100644
--- a/geocoder/admin0/test/run.sh
+++ b/geocoder/admin0/test/run.sh
@@ -98,9 +98,16 @@ function sql() {
     	if [[ "$2" == "should" ]]
     	then
       		if [[ "${RESULT}" != "$3" ]]
-      		then
-            	log_error "QUERY '${QUERY}' expected result '${3}' but got '${RESULT}'"
-            	set_failed
+                then
+                    # Deal with bool values from pg, returned as t/f instead of true/false
+                    if [[ "$3" == "true" && "${RESULT}" == "t" ]] || [[ "$3" == "false" && "${RESULT}" == "f" ]]
+                    then
+                        # do nothing, test ok
+                        true
+                    else
+                        log_error "QUERY '${QUERY}' expected result '${3}' but got '${RESULT}'"
+                        set_failed
+                    fi
         	fi
     	fi
     fi

From cc58df6fcdc6dd83d2dff0dd805d20f4da223041 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Thu, 22 Oct 2015 17:05:09 +0200
Subject: [PATCH 04/11] First version of the extension cdb_geocoder_admin0

---
 geocoder/admin0/extension/Makefile            |   7 +
 .../extension/cdb_geocoder_admin0--0.0.1.sql  | 193 ++++++++++++++++++
 .../extension/cdb_geocoder_admin0.control     |   5 +
 geocoder/admin0/sql/admin0_synonyms.sql       |  72 -------
 geocoder/admin0/sql/geocoder.sql              |  21 --
 geocoder/admin0/sql/synonym_service.sql       |  14 --
 geocoder/setup/admin0/response-types.sql      |   3 -
 geocoder/setup/admin0/triggers.sql            |  12 --
 8 files changed, 205 insertions(+), 122 deletions(-)
 create mode 100644 geocoder/admin0/extension/Makefile
 create mode 100644 geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
 create mode 100644 geocoder/admin0/extension/cdb_geocoder_admin0.control
 delete mode 100644 geocoder/admin0/sql/admin0_synonyms.sql
 delete mode 100644 geocoder/admin0/sql/geocoder.sql
 delete mode 100644 geocoder/admin0/sql/synonym_service.sql
 delete mode 100644 geocoder/setup/admin0/response-types.sql
 delete mode 100644 geocoder/setup/admin0/triggers.sql

diff --git a/geocoder/admin0/extension/Makefile b/geocoder/admin0/extension/Makefile
new file mode 100644
index 0000000..62b397a
--- /dev/null
+++ b/geocoder/admin0/extension/Makefile
@@ -0,0 +1,7 @@
+EXTENSION = cdb_geocoder_admin0
+DATA = cdb_geocoder_admin0--0.0.1.sql
+
+# postgres build stuff
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
diff --git a/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql b/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
new file mode 100644
index 0000000..ba53e19
--- /dev/null
+++ b/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
@@ -0,0 +1,193 @@
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION cdb_geocoder_admin0" to load this file. \quit
+
+-- Response types for admin0 geocoder
+CREATE TYPE geocode_admin_v1 AS (q TEXT, geom GEOMETRY, success BOOLEAN);
+CREATE TYPE synonym_lookup_v1 AS (q TEXT, adm0_a3 TEXT);
+
+-- Public API functions --
+--- Geocoding function ---
+-- TODO: deal with permissions
+CREATE OR REPLACE FUNCTION geocode_admin0_polygons(name text[])
+  RETURNS SETOF geocode_admin_v1 AS $$
+  DECLARE
+    ret geocode_admin_v1%rowtype;
+  BEGIN
+  -- FOR ret IN
+  RETURN QUERY
+    SELECT d.q, n.the_geom as geom, CASE WHEN s.adm0_a3 IS NULL then FALSE ELSE TRUE END AS success
+      FROM (SELECT q, lower(regexp_replace(q, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text x
+        FROM (SELECT unnest(name) q) g) d
+      LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x
+      LEFT OUTER JOIN ne_admin0_v3 n ON s.adm0_a3 = n.adm0_a3 GROUP BY d.q, n.the_geom, s.adm0_a3;
+END
+$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
+
+
+-- admin0_synonym_lookup
+CREATE OR REPLACE FUNCTION admin0_synonym_lookup(name text[])
+ RETURNS SETOF synonym_lookup_v1 AS $$
+ DECLARE
+    ret synonym_lookup_v1%rowtype;
+ BEGIN  RETURN QUERY
+    SELECT d.q, s.adm0_a3
+      FROM (SELECT q, lower(regexp_replace(q, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text x
+        FROM (SELECT unnest(name) q) g) d
+      LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x GROUP BY d.q, s.adm0_a3;
+END
+$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
+
+--------------------------------------------------------------------------------
+
+-- Support tables
+
+CREATE TABLE admin0_synonyms (
+    name text,
+    rank double precision,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    the_geom geometry(Geometry,4326),
+    the_geom_webmercator geometry(Geometry,3857),
+    cartodb_id integer NOT NULL,
+    adm0_a3 text,
+    name_ text
+);
+
+CREATE SEQUENCE admin0_synonyms_cartodb_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+ALTER SEQUENCE admin0_synonyms_cartodb_id_seq OWNED BY admin0_synonyms.cartodb_id;
+ALTER TABLE ONLY admin0_synonyms ALTER COLUMN cartodb_id SET DEFAULT nextval('admin0_synonyms_cartodb_id_seq'::regclass);
+
+
+ALTER TABLE ONLY admin0_synonyms
+    ADD CONSTRAINT admin0_synonyms_cartodb_id_key UNIQUE (cartodb_id);
+ALTER TABLE ONLY admin0_synonyms
+    ADD CONSTRAINT admin0_synonyms_pkey PRIMARY KEY (cartodb_id);
+
+
+CREATE INDEX admin0_synonyms_the_geom_idx ON admin0_synonyms USING gist (the_geom);
+CREATE INDEX admin0_synonyms_the_geom_webmercator_idx ON admin0_synonyms USING gist (the_geom_webmercator);
+CREATE INDEX idx_admin0_synonyms_nam ON admin0_synonyms USING btree (name);
+CREATE INDEX idx_admin0_synonyms_name ON admin0_synonyms USING btree (lower(regexp_replace(name, '\W+'::text, ''::text)));
+CREATE INDEX idx_admin0_synonyms_name_ ON admin0_synonyms USING btree (name_);
+CREATE INDEX idx_admin0_synonyms_name_patt ON admin0_synonyms USING btree (name_ text_pattern_ops);
+CREATE INDEX idx_admin0_synonyms_name_rank ON admin0_synonyms USING btree (name_, rank);
+CREATE INDEX idx_admin0_synonyms_rank ON admin0_synonyms USING btree (rank);
+
+-- create trigger function. used in both admin0 and admin1 synonym tables
+CREATE OR REPLACE FUNCTION alpha_numeric_identifiers() RETURNS trigger AS $alpha_numeric_identifiers$
+    BEGIN
+        NEW.name_ := lower(regexp_replace(NEW.name, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'));
+        RETURN NEW;
+    END;
+$alpha_numeric_identifiers$ LANGUAGE plpgsql;
+
+CREATE TRIGGER admin0_synonyms_name_update BEFORE INSERT OR UPDATE OF name ON admin0_synonyms FOR EACH ROW EXECUTE PROCEDURE alpha_numeric_identifiers();
+CREATE TRIGGER track_updates AFTER INSERT OR DELETE OR UPDATE OR TRUNCATE ON admin0_synonyms FOR EACH STATEMENT EXECUTE PROCEDURE cartodb.cdb_tablemetadata_trigger();
+CREATE TRIGGER update_the_geom_webmercator_trigger BEFORE INSERT OR UPDATE OF the_geom ON admin0_synonyms FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_the_geom_webmercator();
+CREATE TRIGGER update_updated_at_trigger BEFORE UPDATE ON admin0_synonyms FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_updated_at();
+
+
+
+
+CREATE TABLE ne_admin0_v3 (
+    the_geom geometry(Geometry,4326),
+    scalerank integer,
+    featurecla text,
+    labelrank double precision,
+    sovereignt text,
+    sov_a3 text,
+    adm0_dif double precision,
+    level double precision,
+    type text,
+    admin text,
+    adm0_a3 text,
+    geou_dif double precision,
+    geounit text,
+    gu_a3 text,
+    su_dif double precision,
+    subunit text,
+    su_a3 text,
+    brk_diff double precision,
+    name text,
+    name_long text,
+    brk_a3 text,
+    brk_name text,
+    brk_group text,
+    abbrev text,
+    postal text,
+    formal_en text,
+    formal_fr text,
+    note_adm0 text,
+    note_brk text,
+    name_sort text,
+    name_alt text,
+    mapcolor7 double precision,
+    mapcolor8 double precision,
+    mapcolor9 double precision,
+    mapcolor13 double precision,
+    pop_est double precision,
+    gdp_md_est double precision,
+    pop_year double precision,
+    lastcensus double precision,
+    gdp_year double precision,
+    economy text,
+    income_grp text,
+    wikipedia double precision,
+    fips_10_ text,
+    iso_a2 text,
+    iso_a3 text,
+    iso_n3 text,
+    un_a3 text,
+    wb_a2 text,
+    wb_a3 text,
+    woe_id double precision,
+    woe_id_eh double precision,
+    woe_note text,
+    adm0_a3_is text,
+    adm0_a3_us text,
+    adm0_a3_un double precision,
+    adm0_a3_wb double precision,
+    continent text,
+    region_un text,
+    subregion text,
+    region_wb text,
+    name_len double precision,
+    long_len double precision,
+    abbrev_len double precision,
+    tiny double precision,
+    homepart double precision,
+    cartodb_id integer NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    the_geom_webmercator geometry(Geometry,3857)
+)
+WITH (autovacuum_enabled=true, toast.autovacuum_enabled=true);
+
+CREATE SEQUENCE ne_10m_admin_0_countries_1_cartodb_id_seq1
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+ALTER SEQUENCE ne_10m_admin_0_countries_1_cartodb_id_seq1 OWNED BY ne_admin0_v3.cartodb_id;
+ALTER TABLE ONLY ne_admin0_v3 ALTER COLUMN cartodb_id SET DEFAULT nextval('ne_10m_admin_0_countries_1_cartodb_id_seq1'::regclass);
+ALTER TABLE ONLY ne_admin0_v3
+    ADD CONSTRAINT ne_10m_admin_0_countries_1_cartodb_id_key UNIQUE (cartodb_id);
+ALTER TABLE ONLY ne_admin0_v3
+    ADD CONSTRAINT ne_10m_admin_0_countries_1_pkey1 PRIMARY KEY (cartodb_id);
+
+CREATE INDEX idx_ne_admin0_v3_a3 ON ne_admin0_v3 USING btree (adm0_a3);
+CREATE UNIQUE INDEX idx_ne_admin0_v3_adm0_a3 ON ne_admin0_v3 USING btree (adm0_a3);
+CREATE INDEX ne_10m_admin_0_countries_1_the_geom_webmercator_idx ON ne_admin0_v3 USING gist (the_geom_webmercator);
+CREATE INDEX the_geom_4e1a2710_110a_11e4_b0ba_7054d21a95e5 ON ne_admin0_v3 USING gist (the_geom);
+
+CREATE TRIGGER test_quota BEFORE INSERT OR UPDATE ON ne_admin0_v3 FOR EACH STATEMENT EXECUTE PROCEDURE cartodb.cdb_checkquota('1', '-1', 'public');
+CREATE TRIGGER test_quota_per_row BEFORE INSERT OR UPDATE ON ne_admin0_v3 FOR EACH ROW EXECUTE PROCEDURE cartodb.cdb_checkquota('0.001', '-1', 'public');
+CREATE TRIGGER track_updates AFTER INSERT OR DELETE OR UPDATE OR TRUNCATE ON ne_admin0_v3 FOR EACH STATEMENT EXECUTE PROCEDURE cartodb.cdb_tablemetadata_trigger();
+CREATE TRIGGER update_the_geom_webmercator_trigger BEFORE INSERT OR UPDATE OF the_geom ON ne_admin0_v3 FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_the_geom_webmercator();
+CREATE TRIGGER update_updated_at_trigger BEFORE UPDATE ON ne_admin0_v3 FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_updated_at();
diff --git a/geocoder/admin0/extension/cdb_geocoder_admin0.control b/geocoder/admin0/extension/cdb_geocoder_admin0.control
new file mode 100644
index 0000000..e27160e
--- /dev/null
+++ b/geocoder/admin0/extension/cdb_geocoder_admin0.control
@@ -0,0 +1,5 @@
+# cdb geocoder admin0 extension
+comment = 'CartoDB admin0 internal geocoder'
+default_version = '0.0.1'
+relocatable = true
+requires = cartodb
diff --git a/geocoder/admin0/sql/admin0_synonyms.sql b/geocoder/admin0/sql/admin0_synonyms.sql
deleted file mode 100644
index b593b1a..0000000
--- a/geocoder/admin0/sql/admin0_synonyms.sql
+++ /dev/null
@@ -1,72 +0,0 @@
-CREATE TABLE admin0_synonyms (
-    name text,
-    rank double precision,
-    created_at timestamp with time zone DEFAULT now() NOT NULL,
-    updated_at timestamp with time zone DEFAULT now() NOT NULL,
-    the_geom geometry(Geometry,4326),
-    the_geom_webmercator geometry(Geometry,3857),
-    cartodb_id integer NOT NULL,
-    adm0_a3 text,
-    name_ text
-);
-
-CREATE SEQUENCE admin0_synonyms_cartodb_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
-ALTER SEQUENCE admin0_synonyms_cartodb_id_seq OWNED BY admin0_synonyms.cartodb_id;
-
-
-ALTER TABLE ONLY admin0_synonyms ALTER COLUMN cartodb_id SET DEFAULT nextval('admin0_synonyms_cartodb_id_seq'::regclass);
-
-
-ALTER TABLE ONLY admin0_synonyms
-    ADD CONSTRAINT admin0_synonyms_cartodb_id_key UNIQUE (cartodb_id);
-
-
-ALTER TABLE ONLY admin0_synonyms
-    ADD CONSTRAINT admin0_synonyms_pkey PRIMARY KEY (cartodb_id);
-
-
-CREATE INDEX admin0_synonyms_the_geom_idx ON admin0_synonyms USING gist (the_geom);
-
-
-CREATE INDEX admin0_synonyms_the_geom_webmercator_idx ON admin0_synonyms USING gist (the_geom_webmercator);
-
-
-CREATE INDEX idx_admin0_synonyms_nam ON admin0_synonyms USING btree (name);
-
-
-CREATE INDEX idx_admin0_synonyms_name ON admin0_synonyms USING btree (lower(regexp_replace(name, '\W+'::text, ''::text)));
-
-
-CREATE INDEX idx_admin0_synonyms_name_ ON admin0_synonyms USING btree (name_);
-
-
-CREATE INDEX idx_admin0_synonyms_name_patt ON admin0_synonyms USING btree (name_ text_pattern_ops);
-
-CREATE INDEX idx_admin0_synonyms_name_rank ON admin0_synonyms USING btree (name_, rank);
-
-
-
-CREATE INDEX idx_admin0_synonyms_rank ON admin0_synonyms USING btree (rank);
-
-
-
-CREATE TRIGGER admin0_synonyms_name_update BEFORE INSERT OR UPDATE OF name ON admin0_synonyms FOR EACH ROW EXECUTE PROCEDURE alpha_numeric_identifiers();
-
-
-
-CREATE TRIGGER track_updates AFTER INSERT OR DELETE OR UPDATE OR TRUNCATE ON admin0_synonyms FOR EACH STATEMENT EXECUTE PROCEDURE cartodb.cdb_tablemetadata_trigger();
-
-
-
-CREATE TRIGGER update_the_geom_webmercator_trigger BEFORE INSERT OR UPDATE OF the_geom ON admin0_synonyms FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_the_geom_webmercator();
-
-
-CREATE TRIGGER update_updated_at_trigger BEFORE UPDATE ON admin0_synonyms FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_updated_at();
-
diff --git a/geocoder/admin0/sql/geocoder.sql b/geocoder/admin0/sql/geocoder.sql
deleted file mode 100644
index 6e9489d..0000000
--- a/geocoder/admin0/sql/geocoder.sql
+++ /dev/null
@@ -1,21 +0,0 @@
---- Geocoding function ---
-CREATE OR REPLACE FUNCTION geocode_admin0_polygons(name text[])
-  RETURNS SETOF geocode_admin_v1 AS $$
-  DECLARE
-    ret geocode_admin_v1%rowtype;
-  BEGIN
-  -- FOR ret IN
-  RETURN QUERY
-    SELECT d.q, n.the_geom as geom, CASE WHEN s.adm0_a3 IS NULL then FALSE ELSE TRUE END AS success FROM (SELECT q, lower(regexp_replace(q, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text x FROM (SELECT unnest(name) q) g) d LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x LEFT OUTER JOIN ne_admin0_v3 n ON s.adm0_a3 = n.adm0_a3 GROUP BY d.q, n.the_geom, s.adm0_a3;
-END
-$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
-
--- admin0_synonym_lookup
-CREATE OR REPLACE FUNCTION admin0_synonym_lookup(name text[])
- RETURNS SETOF synonym_lookup_v1 AS $$
- DECLARE
-    ret synonym_lookup_v1%rowtype;
- BEGIN  RETURN QUERY
-    SELECT d.q, s.adm0_a3 FROM (SELECT q, lower(regexp_replace(q, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text x FROM (SELECT unnest(name) q) g) d LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x GROUP BY d.q, s.adm0_a3;
-END
-$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
diff --git a/geocoder/admin0/sql/synonym_service.sql b/geocoder/admin0/sql/synonym_service.sql
deleted file mode 100644
index ec3320b..0000000
--- a/geocoder/admin0/sql/synonym_service.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-
---EXAMPLE
--- SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*
-
-CREATE OR REPLACE FUNCTION admin0_synonym_lookup(name text[])
-  RETURNS SETOF synonym_lookup_v1 AS $$
-  DECLARE
-    ret synonym_lookup_v1%rowtype;
-  BEGIN
-  -- FOR ret IN
-  RETURN QUERY
-    SELECT d.q, s.adm0_a3 FROM (SELECT q, lower(regexp_replace(q, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text x FROM (SELECT unnest(name) q) g) d LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x GROUP BY d.q, s.adm0_a3;
-END
-$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
diff --git a/geocoder/setup/admin0/response-types.sql b/geocoder/setup/admin0/response-types.sql
deleted file mode 100644
index cf24270..0000000
--- a/geocoder/setup/admin0/response-types.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Response types for admin0 geocoder
-CREATE TYPE geocode_admin_v1 AS (q TEXT, geom GEOMETRY, success BOOLEAN);
-CREATE TYPE synonym_lookup_v1 AS (q TEXT, adm0_a3 TEXT);
diff --git a/geocoder/setup/admin0/triggers.sql b/geocoder/setup/admin0/triggers.sql
deleted file mode 100644
index 539f1bf..0000000
--- a/geocoder/setup/admin0/triggers.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- create trigger function. used in both admin0 and admin1 synonym tables
-CREATE OR REPLACE FUNCTION alpha_numeric_identifiers() RETURNS trigger AS $alpha_numeric_identifiers$
-    BEGIN
-        NEW.name_ := lower(regexp_replace(NEW.name, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'));
-        RETURN NEW;
-    END;
-$alpha_numeric_identifiers$ LANGUAGE plpgsql;
-
--- add trigger on admin0 synonym table name_ column
-CREATE TRIGGER admin0_synonyms_name_update
-BEFORE INSERT OR UPDATE OF name ON admin0_synonyms
-  FOR EACH ROW EXECUTE PROCEDURE alpha_numeric_identifiers()

From 44925588ded153e2107f306c4c7a0ea0158b26cc Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Fri, 23 Oct 2015 11:55:27 +0200
Subject: [PATCH 05/11] Fix permissions

---
 geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql | 4 ++--
 geocoder/admin0/extension/cdb_geocoder_admin0.control    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql b/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
index ba53e19..a9e0e32 100644
--- a/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
+++ b/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
@@ -21,7 +21,7 @@ CREATE OR REPLACE FUNCTION geocode_admin0_polygons(name text[])
       LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x
       LEFT OUTER JOIN ne_admin0_v3 n ON s.adm0_a3 = n.adm0_a3 GROUP BY d.q, n.the_geom, s.adm0_a3;
 END
-$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
+$$ LANGUAGE 'plpgsql';
 
 
 -- admin0_synonym_lookup
@@ -35,7 +35,7 @@ CREATE OR REPLACE FUNCTION admin0_synonym_lookup(name text[])
         FROM (SELECT unnest(name) q) g) d
       LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x GROUP BY d.q, s.adm0_a3;
 END
-$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
+$$ LANGUAGE 'plpgsql';
 
 --------------------------------------------------------------------------------
 
diff --git a/geocoder/admin0/extension/cdb_geocoder_admin0.control b/geocoder/admin0/extension/cdb_geocoder_admin0.control
index e27160e..eedb9b1 100644
--- a/geocoder/admin0/extension/cdb_geocoder_admin0.control
+++ b/geocoder/admin0/extension/cdb_geocoder_admin0.control
@@ -3,3 +3,4 @@ comment = 'CartoDB admin0 internal geocoder'
 default_version = '0.0.1'
 relocatable = true
 requires = cartodb
+superuser = false

From 9aa226ea836a63582f785d514c520d61167c7783 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Fri, 23 Oct 2015 12:24:29 +0200
Subject: [PATCH 06/11] Fix permissions, this time for real

---
 geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql b/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
index a9e0e32..fc4091d 100644
--- a/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
+++ b/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
@@ -21,7 +21,7 @@ CREATE OR REPLACE FUNCTION geocode_admin0_polygons(name text[])
       LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x
       LEFT OUTER JOIN ne_admin0_v3 n ON s.adm0_a3 = n.adm0_a3 GROUP BY d.q, n.the_geom, s.adm0_a3;
 END
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
 
 
 -- admin0_synonym_lookup
@@ -35,7 +35,7 @@ CREATE OR REPLACE FUNCTION admin0_synonym_lookup(name text[])
         FROM (SELECT unnest(name) q) g) d
       LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x GROUP BY d.q, s.adm0_a3;
 END
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
 
 --------------------------------------------------------------------------------
 
@@ -191,3 +191,8 @@ CREATE TRIGGER test_quota_per_row BEFORE INSERT OR UPDATE ON ne_admin0_v3 FOR EA
 CREATE TRIGGER track_updates AFTER INSERT OR DELETE OR UPDATE OR TRUNCATE ON ne_admin0_v3 FOR EACH STATEMENT EXECUTE PROCEDURE cartodb.cdb_tablemetadata_trigger();
 CREATE TRIGGER update_the_geom_webmercator_trigger BEFORE INSERT OR UPDATE OF the_geom ON ne_admin0_v3 FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_the_geom_webmercator();
 CREATE TRIGGER update_updated_at_trigger BEFORE UPDATE ON ne_admin0_v3 FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_updated_at();
+
+
+-- This is needed to let publicuser execute the functions above without granting privileges on the tables
+GRANT SELECT ON public.geometry_columns TO publicuser;
+GRANT SELECT ON public.geography_columns TO publicuser;

From d6e1fb42ae6f5a1d60a73cd09d1b573782a68457 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Fri, 23 Oct 2015 14:03:48 +0200
Subject: [PATCH 07/11] Remove uneeded GRANT on postgis tables

---
 geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql b/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
index fc4091d..ba53e19 100644
--- a/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
+++ b/geocoder/admin0/extension/cdb_geocoder_admin0--0.0.1.sql
@@ -191,8 +191,3 @@ CREATE TRIGGER test_quota_per_row BEFORE INSERT OR UPDATE ON ne_admin0_v3 FOR EA
 CREATE TRIGGER track_updates AFTER INSERT OR DELETE OR UPDATE OR TRUNCATE ON ne_admin0_v3 FOR EACH STATEMENT EXECUTE PROCEDURE cartodb.cdb_tablemetadata_trigger();
 CREATE TRIGGER update_the_geom_webmercator_trigger BEFORE INSERT OR UPDATE OF the_geom ON ne_admin0_v3 FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_the_geom_webmercator();
 CREATE TRIGGER update_updated_at_trigger BEFORE UPDATE ON ne_admin0_v3 FOR EACH ROW EXECUTE PROCEDURE cartodb._cdb_update_updated_at();
-
-
--- This is needed to let publicuser execute the functions above without granting privileges on the tables
-GRANT SELECT ON public.geometry_columns TO publicuser;
-GRANT SELECT ON public.geography_columns TO publicuser;

From 491eac38ad2fcc57d6604d29c182d5015c1e6e98 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Fri, 23 Oct 2015 14:15:32 +0200
Subject: [PATCH 08/11] Add a silly test to the extension

---
 geocoder/admin0/extension/.gitignore                |  1 +
 geocoder/admin0/extension/Makefile                  |  1 +
 .../extension/expected/cdb_geocoder_admin0_test.out | 13 +++++++++++++
 .../extension/sql/cdb_geocoder_admin0_test.sql      |  8 ++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 geocoder/admin0/extension/.gitignore
 create mode 100644 geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out
 create mode 100644 geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql

diff --git a/geocoder/admin0/extension/.gitignore b/geocoder/admin0/extension/.gitignore
new file mode 100644
index 0000000..fbca225
--- /dev/null
+++ b/geocoder/admin0/extension/.gitignore
@@ -0,0 +1 @@
+results/
diff --git a/geocoder/admin0/extension/Makefile b/geocoder/admin0/extension/Makefile
index 62b397a..cf92715 100644
--- a/geocoder/admin0/extension/Makefile
+++ b/geocoder/admin0/extension/Makefile
@@ -1,5 +1,6 @@
 EXTENSION = cdb_geocoder_admin0
 DATA = cdb_geocoder_admin0--0.0.1.sql
+REGRESS = cdb_geocoder_admin0_test
 
 # postgres build stuff
 PG_CONFIG = pg_config
diff --git a/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out b/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out
new file mode 100644
index 0000000..834ab14
--- /dev/null
+++ b/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out
@@ -0,0 +1,13 @@
+CREATE EXTENSION postgis;
+CREATE EXTENSION schema_triggers;
+CREATE EXTENSION plpythonu;
+CREATE EXTENSION cartodb;
+CREATE EXTENSION cdb_geocoder_admin0;
+-- Check that the synonym function is callable, should return NULL
+SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*;
+       q       | adm0_a3 
+---------------+---------
+ United States | 
+ ESP           | 
+(2 rows)
+
diff --git a/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql b/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql
new file mode 100644
index 0000000..c5fe53f
--- /dev/null
+++ b/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql
@@ -0,0 +1,8 @@
+CREATE EXTENSION postgis;
+CREATE EXTENSION schema_triggers;
+CREATE EXTENSION plpythonu;
+CREATE EXTENSION cartodb;
+CREATE EXTENSION cdb_geocoder_admin0;
+
+-- Check that the synonym function is callable, should return NULL
+SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*;

From 604c4ed615dde2d66481da1189d90108bf36a16c Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Fri, 23 Oct 2015 14:19:41 +0200
Subject: [PATCH 09/11] Another basic test

---
 .../extension/expected/cdb_geocoder_admin0_test.out      | 9 +++++++++
 .../admin0/extension/sql/cdb_geocoder_admin0_test.sql    | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out b/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out
index 834ab14..92a15ff 100644
--- a/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out
+++ b/geocoder/admin0/extension/expected/cdb_geocoder_admin0_test.out
@@ -11,3 +11,12 @@ SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*;
  ESP           | 
 (2 rows)
 
+-- Check that the geocoding function is callable, should return success = false
+SELECT (geocode_admin0_polygons(Array['Spain', 'USA', ''])).*;
+   q   | geom | success 
+-------+------+---------
+       |      | f
+ Spain |      | f
+ USA   |      | f
+(3 rows)
+
diff --git a/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql b/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql
index c5fe53f..e782008 100644
--- a/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql
+++ b/geocoder/admin0/extension/sql/cdb_geocoder_admin0_test.sql
@@ -6,3 +6,6 @@ CREATE EXTENSION cdb_geocoder_admin0;
 
 -- Check that the synonym function is callable, should return NULL
 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', ''])).*;

From 325cb004c047701c8d491deeaec2ddad73cd8f2e Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Fri, 23 Oct 2015 14:32:08 +0200
Subject: [PATCH 10/11] 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'])).*;

From 3ec4332b7c91e4b168bf7bdb338f86d3e56e2da5 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Fri, 23 Oct 2015 16:05:08 +0200
Subject: [PATCH 11/11] A README for the extension

---
 geocoder/admin0/extension/README.md | 36 +++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 geocoder/admin0/extension/README.md

diff --git a/geocoder/admin0/extension/README.md b/geocoder/admin0/extension/README.md
new file mode 100644
index 0000000..96dd39a
--- /dev/null
+++ b/geocoder/admin0/extension/README.md
@@ -0,0 +1,36 @@
+# CartoDB admin0 geocoder extension
+Postgres extension for the CartoDB admin0 geocoder. It is meant to contain the functions and related objects needed to geocode by admin0 regions. It is not meant to contain the actual data used to geocode them.
+
+## Dependencies
+This extension is thought to be used on top of CartoDB platform. Therefore a cartodb user is required to install the extension onto it.
+
+The following is a non-comprehensive list of dependencies:
+
+- Postgres 9.3+
+- Postgis extension
+- Schema triggers extension
+- CartoDB extension
+
+## Installation into the db cluster
+This requires root privileges
+```
+sudo make all install
+```
+
+## Execute tests
+```
+PGUSER=postgres make installcheck
+```
+
+## Install onto a user's database
+```
+psql -U development_cartodb_user_fe3b850a-01c0-48f9-8a26-a82f09e9b53f cartodb_dev_user_fe3b850a-01c0-48f9-8a26-a82f09e9b53f_db
+```
+
+and then:
+
+```sql
+CREATE EXTENSION cdb_geocoder_admin0;
+```
+
+The extension creation in the user's db does not require special privileges. It can be even created from the sql api.