Business intelligence made simple
Added support for Rails 5
Andrew Kane9637744c5fea
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 93d99964..7b45cfca 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,5 +1,6 @@## 1.3.2 [unreleased]+- Added support for Rails 5- Attempt to reconnect for checks## 1.3.1diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rbindex 795599e8..3a910bc3 100644--- a/app/controllers/blazer/base_controller.rb+++ b/app/controllers/blazer/base_controller.rb@@ -57,7 +57,7 @@ module Blazerhelper_method :extract_varsdef variable_params- params.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)+ params.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).permit!endhelper_method :variable_paramsdiff --git a/app/models/blazer/audit.rb b/app/models/blazer/audit.rbindex 274a4b32..fbff8c1c 100644--- a/app/models/blazer/audit.rb+++ b/app/models/blazer/audit.rb@@ -1,6 +1,6 @@module Blazerclass Audit < ActiveRecord::Base- belongs_to :user, class_name: Blazer.user_class.to_s- belongs_to :query+ belongs_to :user, class_name: Blazer.user_class.to_s, required: false+ belongs_to :query, required: falseendenddiff --git a/app/models/blazer/query.rb b/app/models/blazer/query.rbindex ecdc5a71..8d3109ab 100644--- a/app/models/blazer/query.rb+++ b/app/models/blazer/query.rb@@ -1,6 +1,6 @@module Blazerclass Query < ActiveRecord::Base- belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_class+ belongs_to :creator, class_name: Blazer.user_class.to_s, required: false if Blazer.user_classhas_many :checks, dependent: :destroyhas_many :dashboard_queries, dependent: :destroyhas_many :dashboards, through: :dashboard_queriesdiff --git a/app/views/blazer/queries/_tables.html b/app/views/blazer/queries/_tables.html.erbsimilarity index 100%rename from app/views/blazer/queries/_tables.htmlrename to app/views/blazer/queries/_tables.html.erbdiff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rbindex 39e6f186..12b1d407 100644--- a/lib/blazer/data_source.rb+++ b/lib/blazer/data_source.rb@@ -90,10 +90,11 @@ module Blazerendresult = connection_model.connection.select_all("#{statement} /*#{comment}*/")+ cast_method = Rails::VERSION::MAJOR < 5 ? :type_cast : :cast_valueresult.each do |untyped_row|row = {}untyped_row.each do |k, v|- row[k] = result.column_types.empty? ? v : result.column_types[k].send(:type_cast, v)+ row[k] = result.column_types.empty? ? v : result.column_types[k].send(cast_method, v)endrows << rowend