From ddd66aff08d344ce8253640ab9c06b281944931a Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 3 Nov 2015 16:03:44 +0100 Subject: [PATCH] First try at moving admin1 to merged extension --- geocoder/admin1/extension/.gitignore | 3 -- geocoder/admin1/extension/Makefile | 8 ----- geocoder/admin1/extension/README.md | 36 ------------------- .../extension/cdb_geocoder_admin1.control | 6 ---- geocoder/extension/Makefile | 4 ++- geocoder/extension/README.md | 6 ++++ .../expected/cdb_geocoder_admin1_test.out | 0 .../sql/0.0.1/20_admin1.sql} | 3 -- .../sql/cdb_geocoder_admin1_test.sql | 0 9 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 geocoder/admin1/extension/.gitignore delete mode 100644 geocoder/admin1/extension/Makefile delete mode 100644 geocoder/admin1/extension/README.md delete mode 100644 geocoder/admin1/extension/cdb_geocoder_admin1.control rename geocoder/{admin1 => }/extension/expected/cdb_geocoder_admin1_test.out (100%) rename geocoder/{admin1/extension/cdb_geocoder_admin1--0.0.1.sql => extension/sql/0.0.1/20_admin1.sql} (98%) rename geocoder/{admin1 => }/extension/sql/cdb_geocoder_admin1_test.sql (100%) diff --git a/geocoder/admin1/extension/.gitignore b/geocoder/admin1/extension/.gitignore deleted file mode 100644 index e710f0e..0000000 --- a/geocoder/admin1/extension/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -results/ -regression.diffs -regression.out diff --git a/geocoder/admin1/extension/Makefile b/geocoder/admin1/extension/Makefile deleted file mode 100644 index b472643..0000000 --- a/geocoder/admin1/extension/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -EXTENSION = cdb_geocoder_admin1 -DATA = cdb_geocoder_admin1--0.0.1.sql -REGRESS = cdb_geocoder_admin1_test - -# postgres build stuff -PG_CONFIG = pg_config -PGXS := $(shell $(PG_CONFIG) --pgxs) -include $(PGXS) diff --git a/geocoder/admin1/extension/README.md b/geocoder/admin1/extension/README.md deleted file mode 100644 index ac99e36..0000000 --- a/geocoder/admin1/extension/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# CartoDB admin1 geocoder extension -Postgres extension for the CartoDB admin1 geocoder. It is meant to contain the functions and related objects needed to geocode by admin1 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_admin1; -``` - -The extension creation in the user's db does not require special privileges. It can be even created from the sql api. diff --git a/geocoder/admin1/extension/cdb_geocoder_admin1.control b/geocoder/admin1/extension/cdb_geocoder_admin1.control deleted file mode 100644 index 7621dcb..0000000 --- a/geocoder/admin1/extension/cdb_geocoder_admin1.control +++ /dev/null @@ -1,6 +0,0 @@ -# cdb geocoder admin1 extension -comment = 'CartoDB admin1 internal geocoder' -default_version = '0.0.1' -relocatable = true -requires = cartodb -superuser = false diff --git a/geocoder/extension/Makefile b/geocoder/extension/Makefile index d79a16c..288e327 100644 --- a/geocoder/extension/Makefile +++ b/geocoder/extension/Makefile @@ -4,7 +4,9 @@ EXTENSION = cdb_geocoder EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/") DATA = $(EXTENSION)--$(EXTVERSION).sql -REGRESS = cdb_geocoder_admin0_test +REGRESS = \ + cdb_geocoder_admin0_test \ + cdb_geocoder_admin1_test # postgres build stuff PG_CONFIG = pg_config diff --git a/geocoder/extension/README.md b/geocoder/extension/README.md index dfa5430..bee0de1 100644 --- a/geocoder/extension/README.md +++ b/geocoder/extension/README.md @@ -22,6 +22,12 @@ sudo make all install PGUSER=postgres make installcheck ``` +## Build, install & test +One-liner: +``` +sudo PGUSER=postgres make all install 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 diff --git a/geocoder/admin1/extension/expected/cdb_geocoder_admin1_test.out b/geocoder/extension/expected/cdb_geocoder_admin1_test.out similarity index 100% rename from geocoder/admin1/extension/expected/cdb_geocoder_admin1_test.out rename to geocoder/extension/expected/cdb_geocoder_admin1_test.out diff --git a/geocoder/admin1/extension/cdb_geocoder_admin1--0.0.1.sql b/geocoder/extension/sql/0.0.1/20_admin1.sql similarity index 98% rename from geocoder/admin1/extension/cdb_geocoder_admin1--0.0.1.sql rename to geocoder/extension/sql/0.0.1/20_admin1.sql index 617beee..3d9060d 100644 --- a/geocoder/admin1/extension/cdb_geocoder_admin1--0.0.1.sql +++ b/geocoder/extension/sql/0.0.1/20_admin1.sql @@ -1,6 +1,3 @@ --- Complain if script is sourced in psql, rather than via CREATE EXTENSION -\echo Use "CREATE EXTENSION cdb_geocoder_admin1" to load this file. \quit - -- Response types for admin1 geocoder -- TODO: check if the types exist already in the db diff --git a/geocoder/admin1/extension/sql/cdb_geocoder_admin1_test.sql b/geocoder/extension/sql/cdb_geocoder_admin1_test.sql similarity index 100% rename from geocoder/admin1/extension/sql/cdb_geocoder_admin1_test.sql rename to geocoder/extension/sql/cdb_geocoder_admin1_test.sql