Skip to content

Business intelligence made simple

Added support for Rails 5

Andrew Kane9637744c5fea
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 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.1
diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rb
index 795599e8..3a910bc3 100644
--- a/app/controllers/blazer/base_controller.rb
+++ b/app/controllers/blazer/base_controller.rb
@@ -57,7 +57,7 @@ module Blazer
helper_method :extract_vars
def 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!
end
helper_method :variable_params
diff --git a/app/models/blazer/audit.rb b/app/models/blazer/audit.rb
index 274a4b32..fbff8c1c 100644
--- a/app/models/blazer/audit.rb
+++ b/app/models/blazer/audit.rb
@@ -1,6 +1,6 @@
module Blazer
class 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: false
end
end
diff --git a/app/models/blazer/query.rb b/app/models/blazer/query.rb
index ecdc5a71..8d3109ab 100644
--- a/app/models/blazer/query.rb
+++ b/app/models/blazer/query.rb
@@ -1,6 +1,6 @@
module Blazer
class 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_class
has_many :checks, dependent: :destroy
has_many :dashboard_queries, dependent: :destroy
has_many :dashboards, through: :dashboard_queries
diff --git a/app/views/blazer/queries/_tables.html b/app/views/blazer/queries/_tables.html.erb
similarity index 100%
rename from app/views/blazer/queries/_tables.html
rename to app/views/blazer/queries/_tables.html.erb
diff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rb
index 39e6f186..12b1d407 100644
--- a/lib/blazer/data_source.rb
+++ b/lib/blazer/data_source.rb
@@ -90,10 +90,11 @@ module Blazer
end
result = connection_model.connection.select_all("#{statement} /*#{comment}*/")
+ cast_method = Rails::VERSION::MAJOR < 5 ? :type_cast : :cast_value
result.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)
end
rows << row
end