From 97af24c2e08b1f17c6ec85092a7bdcac68d97aca Mon Sep 17 00:00:00 2001 From: Guido Fioravantti Date: Fri, 6 Nov 2015 18:28:29 +0100 Subject: [PATCH] Removes unused functions --- .../extension/cdb_geocoder_server--0.0.1.sql | 19 ------------------- server/extension/expected/10_helper_test.out | 14 -------------- .../{20_geocoding.sql => 10_geocoding.sql} | 0 server/extension/sql/0.0.1/10_helper.sql | 19 ------------------- server/extension/sql/10_helper_test.sql | 5 ----- 5 files changed, 57 deletions(-) delete mode 100644 server/extension/expected/10_helper_test.out rename server/extension/sql/0.0.1/{20_geocoding.sql => 10_geocoding.sql} (100%) delete mode 100644 server/extension/sql/0.0.1/10_helper.sql delete mode 100644 server/extension/sql/10_helper_test.sql diff --git a/server/extension/cdb_geocoder_server--0.0.1.sql b/server/extension/cdb_geocoder_server--0.0.1.sql index 3b13869..209907f 100644 --- a/server/extension/cdb_geocoder_server--0.0.1.sql +++ b/server/extension/cdb_geocoder_server--0.0.1.sql @@ -1,25 +1,6 @@ -- Complain if script is sourced in psql, rather than via CREATE EXTENSION \echo Use "CREATE EXTENSION cdb_geocoder_server" to load this file. \quit -- Check if a given host is up by performing a ping -c 1 call. -CREATE OR REPLACE FUNCTION cdb_geocoder_server._check_host(hostname TEXT) - RETURNS BOOLEAN -AS $$ - import os - - response = os.system("ping -c 1 " + hostname) - - return False if response else True -$$ LANGUAGE plpythonu VOLATILE; - --- Returns current pwd -CREATE OR REPLACE FUNCTION cdb_geocoder_server._pwd() - RETURNS TEXT -AS $$ - import os - - return os.getcwd() -$$ LANGUAGE plpythonu VOLATILE; --- Check if a given host is up by performing a ping -c 1 call. CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_street(searchtext TEXT, state TEXT DEFAULT NULL, country TEXT DEFAULT NULL) RETURNS Geometry AS $$ diff --git a/server/extension/expected/10_helper_test.out b/server/extension/expected/10_helper_test.out deleted file mode 100644 index 4e9a2f5..0000000 --- a/server/extension/expected/10_helper_test.out +++ /dev/null @@ -1,14 +0,0 @@ --- Check that check_host is working -select cdb_geocoder_server._check_host('cartodb.com'); - _check_host -------------- - t -(1 row) - --- Check that check_pwd is working -select cdb_geocoder_server._pwd(); - _pwd ------------------------------- - /var/lib/postgresql/9.3/main -(1 row) - diff --git a/server/extension/sql/0.0.1/20_geocoding.sql b/server/extension/sql/0.0.1/10_geocoding.sql similarity index 100% rename from server/extension/sql/0.0.1/20_geocoding.sql rename to server/extension/sql/0.0.1/10_geocoding.sql diff --git a/server/extension/sql/0.0.1/10_helper.sql b/server/extension/sql/0.0.1/10_helper.sql deleted file mode 100644 index 59f5e02..0000000 --- a/server/extension/sql/0.0.1/10_helper.sql +++ /dev/null @@ -1,19 +0,0 @@ --- Check if a given host is up by performing a ping -c 1 call. -CREATE OR REPLACE FUNCTION cdb_geocoder_server._check_host(hostname TEXT) - RETURNS BOOLEAN -AS $$ - import os - - response = os.system("ping -c 1 " + hostname) - - return False if response else True -$$ LANGUAGE plpythonu VOLATILE; - --- Returns current pwd -CREATE OR REPLACE FUNCTION cdb_geocoder_server._pwd() - RETURNS TEXT -AS $$ - import os - - return os.getcwd() -$$ LANGUAGE plpythonu VOLATILE; diff --git a/server/extension/sql/10_helper_test.sql b/server/extension/sql/10_helper_test.sql deleted file mode 100644 index c05abbd..0000000 --- a/server/extension/sql/10_helper_test.sql +++ /dev/null @@ -1,5 +0,0 @@ --- Check that check_host is working -select cdb_geocoder_server._check_host('cartodb.com'); - --- Check that check_pwd is working -select cdb_geocoder_server._pwd();