From 666ef18275e5f9c224c57352ae509fd16924bd9a Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Thu, 18 Feb 2016 19:18:15 +0100 Subject: [PATCH] Add the cartodb extension as a dependency It will be handy to have it available for SQL-implemented functions --- TODO.md | 2 +- pg/crankshaft.control | 2 +- pg/test/0.0.1/expected/01_install_test.out | 1 + pg/test/0.0.1/results/01_install_test.out | 1 + pg/test/0.0.1/sql/01_install_test.sql | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index b3d45cd..8a708e2 100644 --- a/TODO.md +++ b/TODO.md @@ -6,4 +6,4 @@ * Unify style of function comments * [x] Add integration tests * Make target to open a new version development (create symlinks, etc.) -* Should add cartodb ext. as a dependency? +* [x] Should add cartodb ext. as a dependency? diff --git a/pg/crankshaft.control b/pg/crankshaft.control index 08df0ee..74777ac 100644 --- a/pg/crankshaft.control +++ b/pg/crankshaft.control @@ -1,5 +1,5 @@ comment = 'CartoDB Spatial Analysis extension' default_version = '0.0.1' -requires = 'plpythonu, postgis' +requires = 'plpythonu, postgis, cartodb' superuser = true schema = cdb_crankshaft diff --git a/pg/test/0.0.1/expected/01_install_test.out b/pg/test/0.0.1/expected/01_install_test.out index 8e1f9fc..c14537c 100644 --- a/pg/test/0.0.1/expected/01_install_test.out +++ b/pg/test/0.0.1/expected/01_install_test.out @@ -1,5 +1,6 @@ -- Install dependencies CREATE EXTENSION plpythonu; CREATE EXTENSION postgis; +CREATE EXTENSION cartodb; -- Install the extension CREATE EXTENSION crankshaft; diff --git a/pg/test/0.0.1/results/01_install_test.out b/pg/test/0.0.1/results/01_install_test.out index 8e1f9fc..c14537c 100644 --- a/pg/test/0.0.1/results/01_install_test.out +++ b/pg/test/0.0.1/results/01_install_test.out @@ -1,5 +1,6 @@ -- Install dependencies CREATE EXTENSION plpythonu; CREATE EXTENSION postgis; +CREATE EXTENSION cartodb; -- Install the extension CREATE EXTENSION crankshaft; diff --git a/pg/test/0.0.1/sql/01_install_test.sql b/pg/test/0.0.1/sql/01_install_test.sql index 4edd186..54117e5 100644 --- a/pg/test/0.0.1/sql/01_install_test.sql +++ b/pg/test/0.0.1/sql/01_install_test.sql @@ -1,6 +1,7 @@ -- Install dependencies CREATE EXTENSION plpythonu; CREATE EXTENSION postgis; +CREATE EXTENSION cartodb; -- Install the extension CREATE EXTENSION crankshaft;