From 68dba7136b275de0b68a1ced8eaef422bf06a417 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Wed, 18 Nov 2015 15:14:08 +0100
Subject: [PATCH] Split and rename the templates

---
 .../{grant-execute.erb => client-grant-execute.erb}        | 0
 interface/templates/client-plproxy-function.erb            | 5 +++++
 ...-function-definition.erb => client-public-function.erb} | 7 -------
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename interface/templates/{grant-execute.erb => client-grant-execute.erb} (100%)
 create mode 100644 interface/templates/client-plproxy-function.erb
 rename interface/templates/{public-function-definition.erb => client-public-function.erb} (59%)

diff --git a/interface/templates/grant-execute.erb b/interface/templates/client-grant-execute.erb
similarity index 100%
rename from interface/templates/grant-execute.erb
rename to interface/templates/client-grant-execute.erb
diff --git a/interface/templates/client-plproxy-function.erb b/interface/templates/client-plproxy-function.erb
new file mode 100644
index 0000000..f877f25
--- /dev/null
+++ b/interface/templates/client-plproxy-function.erb
@@ -0,0 +1,5 @@
+CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>._<%= signature['function_name'] %> (user_id name, tx_id bigint, <%= signature['argument_data_types'] %>)
+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']);
+$$ LANGUAGE plproxy;
diff --git a/interface/templates/public-function-definition.erb b/interface/templates/client-public-function.erb
similarity index 59%
rename from interface/templates/public-function-definition.erb
rename to interface/templates/client-public-function.erb
index 132beac..3d994b0 100644
--- a/interface/templates/public-function-definition.erb
+++ b/interface/templates/client-public-function.erb
@@ -15,10 +15,3 @@ BEGIN
 END;
 $$ LANGUAGE 'plpgsql' SECURITY DEFINER;
 
---------------------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>._<%= signature['function_name'] %> (user_id name, tx_id bigint, <%= signature['argument_data_types'] %>)
-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']);
-$$ LANGUAGE plproxy;