From 4bffdb5de186555f04ddcb9345f7d575b54cb90f Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Fri, 22 Jan 2016 10:38:34 +0100 Subject: [PATCH] Add default values for the parameters in the functions --- interface.yaml | 7 +++++++ sql-template-renderer | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/interface.yaml b/interface.yaml index c789cd3..e64c504 100644 --- a/interface.yaml +++ b/interface.yaml @@ -51,3 +51,10 @@ params: - { name: ip_address, type: text} +- name: cdb_geocode_street_point + return_type: Geometry + params: + - { name: searchtext, type: text} + - { name: city, type: text, default: 'NULL'} + - { name: state_province, type: text, default: 'NULL'} + - { name: country, type: text, default: 'NULL'} diff --git a/sql-template-renderer b/sql-template-renderer index de5f9a7..5dff053 100755 --- a/sql-template-renderer +++ b/sql-template-renderer @@ -40,7 +40,14 @@ class SqlTemplateRenderer end def params_with_type - @function_signature['params'].map { |p| "#{p['name']} #{p['type']}"}.join(', ') + parameters = @function_signature['params'].map do |p| + if not p['default'].nil? + "#{p['name']} #{p['type']} DEFAULT #{p['default']}" + else + "#{p['name']} #{p['type']}" + end + end + return parameters.join(', ') end end