Adapt to yaml (WIP)

client/templates/20_public_functions.erb

@@ -4,13 +4,12 @@
 -- These are the only ones with permissions to publicuser role
 -- and should also be the only ones with SECURITY DEFINER
 
-CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>.<%= signature['function_name'] %> (<%= signature['argument_data_types'] %>)
-RETURNS <%= signature['result_data_type'] %> AS $$
+CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>.<%= name %> (<%= params_with_type %>)
+RETURNS <%= return_type %> AS $$
 DECLARE
-  ret <%= signature['result_data_type'] %>;
+  ret <%= return_type %>;
 BEGIN
-  -- TODO: this is to be changed according to the feature doc
-  SELECT <%= GEOCODER_CLIENT_SCHEMA %>._geocode_admin0_polygon(session_user, txid_current(), <%= signature['argument_data_types'] %>) INTO ret;
+  SELECT <%= GEOCODER_CLIENT_SCHEMA %>._geocode_admin0_polygon(session_user, txid_current(), <%= params %>) INTO ret;
   RETURN ret;
 END;
 $$ LANGUAGE 'plpgsql' SECURITY DEFINER;

client/templates/30_plproxy_functions.erb

@@ -1,5 +1,5 @@
-CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>._<%= signature['function_name'] %> (user_id name, tx_id bigint, <%= signature['argument_data_types'] %>)
+CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>._<%= name %> (user_id name, tx_id bigint, <%= params_with_type %>)
 RETURNS Geometry AS $$
   CONNECT <%= GEOCODER_CLIENT_SCHEMA %>._server_conn_str();
-  SELECT cdb_geocoder_server.<%= signature['function_name'] %> (user_id, tx_id, signature['argument_data_types']);
+  SELECT cdb_geocoder_server.<%= name %> (user_id, tx_id, <%= params %>);
 $$ LANGUAGE plproxy;

client/templates/90_grant_execute.erb

@@ -1 +1 @@
-GRANT EXECUTE ON FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>.<%= signature['function_name'] %>(<%= signature['argument_data_types'] %>) TO publicuser;
+GRANT EXECUTE ON FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>.<%= name %>(<%= params_with_type %>) TO publicuser;