jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move execute_sql / select_value_sql etc to ApplicationRecord.

Browse Source
This commit is contained in:
evazion
2017-11-26 13:36:28 -06:00
parent 45cecff1a6
commit ec6d553fa6
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/application_record.rb
View File

@@ -64,6 +64,16 @@ class ApplicationRecord < ActiveRecord::Base
connection.execute("SET STATEMENT_TIMEOUT = #{CurrentUser.user.try(:statement_timeout) || 3_000}") unless Rails.env == "test"
end
end
%w(execute select_value select_values select_all).each do |method_name|
define_method("#{method_name}_sql") do |sql, *params|
self.class.connection.__send__(method_name, self.class.send(:sanitize_sql_array, [sql, *params]))
end
self.class.__send__(:define_method, "#{method_name}_sql") do |sql, *params|
connection.__send__(method_name, send(:sanitize_sql_array, [sql, *params]))
end
end
end
concerning :PostgresExtensions do

25
config/initializers/active_record_extensions.rb
View File

@@ -1,25 +0,0 @@
module Danbooru
module Extensions
module ActiveRecord
extend ActiveSupport::Concern
%w(execute select_value select_values select_all).each do |method_name|
define_method("#{method_name}_sql") do |sql, *params|
self.class.connection.__send__(method_name, self.class.sanitize_sql_array([sql, *params]))
end
self.class.__send__(:define_method, "#{method_name}_sql") do |sql, *params|
connection.__send__(method_name, sanitize_sql_array([sql, *params]))
end
end
end
end
end
class ActiveRecord::Base
class << self
public :sanitize_sql_array
end
include Danbooru::Extensions::ActiveRecord
end