Business intelligence made simple
Better handling of checks with variables
Andrew Kane767faefe9d05
diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rbindex 858570b7..1de9bfed 100644--- a/app/controllers/blazer/base_controller.rb+++ b/app/controllers/blazer/base_controller.rb@@ -25,7 +25,7 @@ module Blazerprivatedef process_vars(statement, data_source)- (@bind_vars ||= []).concat(extract_vars(statement)).uniq!+ (@bind_vars ||= []).concat(Blazer.extract_vars(statement)).uniq!@bind_vars.each do |var|params[var] ||= Blazer.data_sources[data_source].variable_defaults[var]end@@ -79,13 +79,6 @@ module Blazer[smart_var, error]end- def extract_vars(statement)- # strip commented out lines- # and regex {1} or {1,2}- statement.gsub(/\-\-.+/, "").gsub(/\/\*.+\*\//m, "").scan(/\{\w*?\}/i).map { |v| v[1...-1] }.reject { |v| /\A\d+(\,\d+)?\z/.match(v) || v.empty? }.uniq- end- helper_method :extract_vars-def variable_paramsparams.except(: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).permit!enddiff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex d83d6216..d4848751 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -279,7 +279,7 @@ module Blazerid: q.id,name: q.name,creator: blazer_user && q.try(:creator) == blazer_user ? "You" : q.try(:creator).try(Blazer.user_name),- vars: extract_vars(q.statement).join(", "),+ vars: q.variables.join(", "),to_param: q.to_param}enddiff --git a/app/models/blazer/check.rb b/app/models/blazer/check.rbindex d2bd7512..dbb86763 100644--- a/app/models/blazer/check.rb+++ b/app/models/blazer/check.rb@@ -5,6 +5,7 @@ module Blazervalidates :query_id, presence: truevalidate :validate_emails+ validate :validate_variables, if: -> { query_id_changed? }before_validation :set_statebefore_validation :fix_emails@@ -84,5 +85,11 @@ module Blazererrors.add(:base, "Invalid emails")endend++ def validate_variables+ if query.variables.any?+ errors.add(:base, "Query can't have variables")+ end+ endendenddiff --git a/app/models/blazer/query.rb b/app/models/blazer/query.rbindex 364b7e54..fca01212 100644--- a/app/models/blazer/query.rb+++ b/app/models/blazer/query.rb@@ -23,5 +23,9 @@ module Blazereditable &&= Blazer.query_editable.call(self, user) if Blazer.query_editableeditableend++ def variables+ Blazer.extract_vars(statement)+ endendenddiff --git a/lib/blazer.rb b/lib/blazer.rbindex cd08afbb..47877ae0 100644--- a/lib/blazer.rb+++ b/lib/blazer.rb@@ -88,6 +88,12 @@ module Blazerendend+ def self.extract_vars(statement)+ # strip commented out lines+ # and regex {1} or {1,2}+ statement.gsub(/\-\-.+/, "").gsub(/\/\*.+\*\//m, "").scan(/\{\w*?\}/i).map { |v| v[1...-1] }.reject { |v| /\A\d+(\,\d+)?\z/.match(v) || v.empty? }.uniq+ end+def self.run_checks(schedule: nil)checks = Blazer::Check.includes(:query)checks = checks.where(schedule: schedule) if schedulediff --git a/lib/blazer/run_statement.rb b/lib/blazer/run_statement.rbindex dc97efeb..8ba3e163 100644--- a/lib/blazer/run_statement.rb+++ b/lib/blazer/run_statement.rb@@ -28,7 +28,7 @@ module Blazeraudit.save! if audit.changed?end- if query && !result.timed_out?+ if query && !result.timed_out? && !query.variables.any?query.checks.each do |check|check.update_state(result)end