From 63786caaa68c8d958016eb5a879a02608b54ac39 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Fri, 1 Dec 2017 12:52:17 +0100 Subject: [PATCH] Fix bad renaming of function parameter This fixes the following error when trying to upgrade: ``` cannot change name of input parameter "organization_name" ``` The problem was introduced ages ago. I fixed it by running a script: ```bash BAD_REGEXP='CREATE OR REPLACE FUNCTION cdb_dataservices_client\._cdb_geocode_admin0_polygon (username text, orgname text, country_name text)' REPLACEMENT='CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text)' git grep -l "$BAD_REGEXP" | xargs sed -i "s/$BAD_REGEXP/$REPLACEMENT/g" ``` --- client/cdb_dataservices_client--0.21.0--0.22.0.sql | 2 +- client/cdb_dataservices_client--0.22.0--0.21.0.sql | 2 +- client/cdb_dataservices_client--0.22.0.sql | 2 +- client/old_versions/cdb_dataservices_client--0.16.0.sql | 2 +- client/old_versions/cdb_dataservices_client--0.17.0.sql | 2 +- client/old_versions/cdb_dataservices_client--0.18.0.sql | 2 +- client/old_versions/cdb_dataservices_client--0.19.0.sql | 2 +- client/old_versions/cdb_dataservices_client--0.20.0.sql | 2 +- client/old_versions/cdb_dataservices_client--0.21.0.sql | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/cdb_dataservices_client--0.21.0--0.22.0.sql b/client/cdb_dataservices_client--0.21.0--0.22.0.sql index cc58b9f..e635d02 100644 --- a/client/cdb_dataservices_client--0.21.0--0.22.0.sql +++ b/client/cdb_dataservices_client--0.21.0--0.22.0.sql @@ -3800,7 +3800,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER STABLE PARALLEL UNSAFE; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, orgname text, country_name text) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_dataservices_client._server_conn_str(); diff --git a/client/cdb_dataservices_client--0.22.0--0.21.0.sql b/client/cdb_dataservices_client--0.22.0--0.21.0.sql index 51d5949..1bea74f 100644 --- a/client/cdb_dataservices_client--0.22.0--0.21.0.sql +++ b/client/cdb_dataservices_client--0.22.0--0.21.0.sql @@ -3798,7 +3798,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, orgname text, country_name text) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_dataservices_client._server_conn_str(); diff --git a/client/cdb_dataservices_client--0.22.0.sql b/client/cdb_dataservices_client--0.22.0.sql index 9036948..fa219a0 100644 --- a/client/cdb_dataservices_client--0.22.0.sql +++ b/client/cdb_dataservices_client--0.22.0.sql @@ -3840,7 +3840,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER STABLE PARALLEL UNSAFE; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, orgname text, country_name text) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_dataservices_client._server_conn_str(); diff --git a/client/old_versions/cdb_dataservices_client--0.16.0.sql b/client/old_versions/cdb_dataservices_client--0.16.0.sql index 248c0cd..30f3d7d 100644 --- a/client/old_versions/cdb_dataservices_client--0.16.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.16.0.sql @@ -3594,7 +3594,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, orgname text, country_name text) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_dataservices_client._server_conn_str(); diff --git a/client/old_versions/cdb_dataservices_client--0.17.0.sql b/client/old_versions/cdb_dataservices_client--0.17.0.sql index 124aaef..7e44d7d 100644 --- a/client/old_versions/cdb_dataservices_client--0.17.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.17.0.sql @@ -3594,7 +3594,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, orgname text, country_name text) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_dataservices_client._server_conn_str(); diff --git a/client/old_versions/cdb_dataservices_client--0.18.0.sql b/client/old_versions/cdb_dataservices_client--0.18.0.sql index a4a2574..a9fff46 100644 --- a/client/old_versions/cdb_dataservices_client--0.18.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.18.0.sql @@ -3716,7 +3716,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, orgname text, country_name text) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_dataservices_client._server_conn_str(); diff --git a/client/old_versions/cdb_dataservices_client--0.19.0.sql b/client/old_versions/cdb_dataservices_client--0.19.0.sql index 93865fe..12ddae9 100644 --- a/client/old_versions/cdb_dataservices_client--0.19.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.19.0.sql @@ -3777,7 +3777,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, orgname text, country_name text) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_dataservices_client._server_conn_str(); diff --git a/client/old_versions/cdb_dataservices_client--0.20.0.sql b/client/old_versions/cdb_dataservices_client--0.20.0.sql index c968a53..3551e94 100644 --- a/client/old_versions/cdb_dataservices_client--0.20.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.20.0.sql @@ -3838,7 +3838,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, orgname text, country_name text) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_dataservices_client._server_conn_str(); diff --git a/client/old_versions/cdb_dataservices_client--0.21.0.sql b/client/old_versions/cdb_dataservices_client--0.21.0.sql index b6bdb9f..cf15e2e 100644 --- a/client/old_versions/cdb_dataservices_client--0.21.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.21.0.sql @@ -3838,7 +3838,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, orgname text, country_name text) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_admin0_polygon (username text, organization_name text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_dataservices_client._server_conn_str();