Business intelligence made simple
Allow all variable names
Andrew Kane5a98e0fe493a
diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rbindex 41b14368..8d7d17af 100644--- a/app/controllers/blazer/base_controller.rb+++ b/app/controllers/blazer/base_controller.rb@@ -102,17 +102,17 @@ module Blazerstatement.apply_cohort_analysis(period: @cohort_period, days: @cohort_days)end- # TODO allow all keys- # or show error message for disallowed keys- UNPERMITTED_KEYS = [:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name, :fork_query_id, :blazer, :run_id, :script_name, :original_script_name]-def variable_params(resource, var_params = nil)- permitted_keys = resource.variables - UNPERMITTED_KEYS.map(&:to_s)+ permitted_keys = resource.variablesvar_params ||= request.query_parametersvar_params.slice(*permitted_keys)endhelper_method :variable_params+ def nested_variable_params(resource)+ variable_params(resource, request.query_parameters["variables"] || {})+ end+def blazer_usersend(Blazer.user_method) if Blazer.user_method && respond_to?(Blazer.user_method, true)enddiff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 03e84f7c..dcf77d23 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -44,6 +44,7 @@ module Blazer@query.data_source ||= upload_settings["data_source"]@query.statement ||= "SELECT * FROM #{upload.table_name} LIMIT 10"end+ @variable_params = nested_variable_params(@query)enddef create@@ -76,6 +77,7 @@ module Blazerenddef edit+ @variable_params = variable_params(@query)enddef rundiff --git a/app/views/blazer/queries/_form.html.erb b/app/views/blazer/queries/_form.html.erbindex 9e7fe393..352cde67 100644--- a/app/views/blazer/queries/_form.html.erb+++ b/app/views/blazer/queries/_form.html.erb@@ -3,7 +3,7 @@<% end %><div id="app" v-cloak>- <%= form_for @query, url: (@query.persisted? ? query_path(@query, params: variable_params(@query)) : queries_path(params: variable_params(@query))), html: {autocomplete: "off"} do |f| %>+ <%= form_for @query, url: (@query.persisted? ? query_path(@query, params: @variable_params) : queries_path(params: @variable_params)), html: {autocomplete: "off"} do |f| %><div class="row"><div id="statement-box" class="col-xs-8"><div class= "form-group">@@ -67,7 +67,7 @@</div><script>- <%= blazer_js_var "variableParams", variable_params(@query) %>+ <%= blazer_js_var "variableParams", @variable_params %><%= blazer_js_var "previewStatement", Hash[Blazer.data_sources.map { |k, v| [k, (v.preview_statement rescue "")] }] %>var app = Vue.createApp({diff --git a/app/views/blazer/queries/show.html.erb b/app/views/blazer/queries/show.html.erbindex 305a28d3..1465cb81 100644--- a/app/views/blazer/queries/show.html.erb+++ b/app/views/blazer/queries/show.html.erb@@ -17,7 +17,7 @@</div><div class="col-sm-3 text-right"><%= link_to "Edit", edit_query_path(@query, params: variable_params(@query)), class: "btn btn-default", disabled: [email protected]?(blazer_user) %>- <%= link_to "Fork", new_query_path(params: variable_params(@query).merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info" %>+ <%= link_to "Fork", new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "btn btn-info" %><% if !@error && @success %><%= button_to "Download", run_queries_path(format: "csv"), params: run_data, class: "btn btn-primary" %>diff --git a/test/queries_test.rb b/test/queries_test.rbindex 1c51d9e7..60771159 100644--- a/test/queries_test.rb+++ b/test/queries_test.rb@@ -83,6 +83,13 @@ class QueriesTest < ActionDispatch::IntegrationTestassert_match %{value="default_value"}, response.bodyend+ def test_variables_id+ query = create_query(statement: "SELECT {id}")+ get blazer.query_path(query), params: {id: 123}+ assert_response :success+ assert_match %!"variables":{"id":"123"}!, response.body+ end+def test_smart_variablesquery = create_query(statement: "SELECT {period}")get blazer.query_path(query)