From d9ca7911e4bff431fda9e67ce4ee74d046d971fd Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Thu, 11 Feb 2016 18:23:23 +0100 Subject: [PATCH] Options parameter in the isolines functions has an empty array by defaul --- client/cdb_dataservices_client--0.1.0--0.2.0.sql | 8 ++++---- client/cdb_dataservices_client--0.2.0.sql | 8 ++++---- client/renderer/interfaces/interface_0.2.0.yaml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/cdb_dataservices_client--0.1.0--0.2.0.sql b/client/cdb_dataservices_client--0.1.0--0.2.0.sql index 94350c1..173859a 100644 --- a/client/cdb_dataservices_client--0.1.0--0.2.0.sql +++ b/client/cdb_dataservices_client--0.1.0--0.2.0.sql @@ -4,7 +4,7 @@ CREATE TYPE cdb_dataservices_client.isoline AS ( the_geom geometry(Multipolygon,4326) ); -CREATE OR REPLACE FUNCTION cdb_dataservices_client.cdb_isodistance (source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT NULL) +CREATE OR REPLACE FUNCTION cdb_dataservices_client.cdb_isodistance (source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT array[]::text[]) RETURNS SETOF cdb_dataservices_client.isoline AS $$ DECLARE username text; @@ -23,7 +23,7 @@ BEGIN END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_isodistance (username text, organization_name text, source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT NULL) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_isodistance (username text, organization_name text, source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT array[]::text[]) RETURNS SETOF cdb_dataservices_client.isoline AS $$ CONNECT cdb_dataservices_client._server_conn_str(); SELECT * FROM cdb_dataservices_server.cdb_isodistance (username, organization_name, source, mode, range, options); @@ -31,7 +31,7 @@ $$ LANGUAGE plproxy; GRANT EXECUTE ON FUNCTION cdb_dataservices_client.cdb_isodistance(source geometry(Geometry, 4326), mode text, range integer[], options text[]) TO publicuser; -CREATE OR REPLACE FUNCTION cdb_dataservices_client.cdb_isochrone (source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT NULL) +CREATE OR REPLACE FUNCTION cdb_dataservices_client.cdb_isochrone (source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT array[]::text[]) RETURNS SETOF cdb_dataservices_client.isoline AS $$ DECLARE username text; @@ -51,7 +51,7 @@ BEGIN END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_isochrone (username text, organization_name text, source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT NULL) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_isochrone (username text, organization_name text, source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT array[]::text[]) RETURNS SETOF cdb_dataservices_client.isoline AS $$ CONNECT cdb_dataservices_client._server_conn_str(); SELECT * FROM cdb_dataservices_server.cdb_isochrone (username, organization_name, source, mode, range, options); diff --git a/client/cdb_dataservices_client--0.2.0.sql b/client/cdb_dataservices_client--0.2.0.sql index bdf99bd..20336ac 100644 --- a/client/cdb_dataservices_client--0.2.0.sql +++ b/client/cdb_dataservices_client--0.2.0.sql @@ -344,7 +344,7 @@ $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -- These are the only ones with permissions to publicuser role -- and should also be the only ones with SECURITY DEFINER -CREATE OR REPLACE FUNCTION cdb_dataservices_client.cdb_isodistance (source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT NULL) +CREATE OR REPLACE FUNCTION cdb_dataservices_client.cdb_isodistance (source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT ARRAY[]::text[]) RETURNS SETOF cdb_dataservices_client.isoline AS $$ DECLARE @@ -372,7 +372,7 @@ $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -- These are the only ones with permissions to publicuser role -- and should also be the only ones with SECURITY DEFINER -CREATE OR REPLACE FUNCTION cdb_dataservices_client.cdb_isochrone (source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT NULL) +CREATE OR REPLACE FUNCTION cdb_dataservices_client.cdb_isochrone (source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT ARRAY[]::text[]) RETURNS SETOF cdb_dataservices_client.isoline AS $$ DECLARE @@ -474,7 +474,7 @@ RETURNS Geometry AS $$ $$ LANGUAGE plproxy; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_isodistance (username text, organization_name text, source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT NULL) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_isodistance (username text, organization_name text, source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT ARRAY[]::text[]) RETURNS SETOF cdb_dataservices_client.isoline AS $$ CONNECT cdb_dataservices_client._server_conn_str(); @@ -482,7 +482,7 @@ RETURNS SETOF cdb_dataservices_client.isoline AS $$ $$ LANGUAGE plproxy; -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_isochrone (username text, organization_name text, source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT NULL) +CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_isochrone (username text, organization_name text, source geometry(Geometry, 4326), mode text, range integer[], options text[] DEFAULT ARRAY[]::text[]) RETURNS SETOF cdb_dataservices_client.isoline AS $$ CONNECT cdb_dataservices_client._server_conn_str(); diff --git a/client/renderer/interfaces/interface_0.2.0.yaml b/client/renderer/interfaces/interface_0.2.0.yaml index e0bc968..71fe731 100644 --- a/client/renderer/interfaces/interface_0.2.0.yaml +++ b/client/renderer/interfaces/interface_0.2.0.yaml @@ -66,7 +66,7 @@ - { name: source, type: "geometry(Geometry, 4326)" } - { name: mode, type: text } - { name: range, type: "integer[]" } - - { name: options, type: "text[]", default: 'NULL' } + - { name: options, type: "text[]", default: 'ARRAY[]::text[]' } - name: cdb_isochrone return_type: SETOF cdb_dataservices_client.isoline @@ -75,5 +75,5 @@ - { name: source, type: "geometry(Geometry, 4326)" } - { name: mode, type: text } - { name: range, type: "integer[]" } - - { name: options, type: "text[]", default: 'NULL' } + - { name: options, type: "text[]", default: 'ARRAY[]::text[]' }