Ver código fonte

Added support for Rails 5

Andrew Kane 9 anos atrás
pai
commit
9637744c5f

+ 1 - 0
CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 1.3.2 [unreleased]
 
+- Added support for Rails 5
 - Attempt to reconnect for checks
 
 ## 1.3.1

+ 1 - 1
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
 

+ 2 - 2
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

+ 1 - 1
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

+ 0 - 0
app/views/blazer/queries/_tables.html → app/views/blazer/queries/_tables.html.erb


+ 2 - 1
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