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

Merge pull request #3404 from evazion/fix-3278

Browse Source 
Fix #3278: Move active_record_extensions into ApplicationRecord
This commit is contained in:
Albert Yi
2017-12-13 14:31:52 -08:00
committed by GitHub
parent 8d5f1bccaf 962b1a2ada
commit 04d9bcedfb
12 changed files with 56 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/bulk_revert.rb
View File

@@ -10,7 +10,7 @@ class BulkRevert
ModAction.log("Processed bulk revert for #{constraints.inspect} by #{creator.name}")
CurrentUser.scoped(creator) do
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
find_post_versions.order("updated_at, id").each do |version|
version.undo!
end

18
app/logical/moderator/dashboard/report.rb
View File

@@ -9,37 +9,37 @@ module Moderator
end
def artists
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
Queries::Artist.all(min_date, max_level)
end
end
def comments
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
Queries::Comment.all(min_date, max_level)
end
end
def mod_actions
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
Queries::ModAction.all
end
end
def notes
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
Queries::Note.all(min_date, max_level)
end
end
def appeals
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
Queries::PostAppeal.all(min_date)
end
end
def flags
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
Queries::PostFlag.all(min_date)
end
end
@@ -49,19 +49,19 @@ module Moderator
end
def posts
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
Queries::Upload.all(min_date, max_level)
end
end
def user_feedbacks
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
Queries::UserFeedback.all
end
end
def wiki_pages
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
Queries::WikiPage.all(min_date, max_level)
end
end

41
app/models/application_record.rb
View File

@@ -43,6 +43,47 @@ class ApplicationRecord < ActiveRecord::Base
end
end
concerning :ActiveRecordExtensions do
class_methods do
def without_timeout
connection.execute("SET STATEMENT_TIMEOUT = 0") unless Rails.env == "test"
yield
ensure
connection.execute("SET STATEMENT_TIMEOUT = #{CurrentUser.user.try(:statement_timeout) || 3_000}") unless Rails.env == "test"
end
def with_timeout(n, default_value = nil, new_relic_params = {})
connection.execute("SET STATEMENT_TIMEOUT = #{n}") unless Rails.env == "test"
yield
rescue ::ActiveRecord::StatementInvalid => x
if Rails.env.production?
NewRelic::Agent.notice_error(x, :custom_params => new_relic_params.merge(:user_id => CurrentUser.id, :user_ip_addr => CurrentUser.ip_addr))
end
return default_value
ensure
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
class_methods do
def columns(*params)
super.reject {|x| x.sql_type == "tsvector"}
end
end
end
def warnings
@warnings ||= ActiveModel::Errors.new(self)
end

2
app/models/comment.rb
View File

@@ -260,5 +260,3 @@ class Comment < ApplicationRecord
DText.quote(body, creator_name)
end
end
Comment.connection.extend(PostgresExtensions)

2
app/models/post.rb
View File

@@ -1883,5 +1883,3 @@ class Post < ApplicationRecord
ret
end
end
Post.connection.extend(PostgresExtensions)

46
config/initializers/active_record_extensions.rb
View File

@@ -1,46 +0,0 @@
module Danbooru
module Extensions
module ActiveRecord
extend ActiveSupport::Concern
module ClassMethods
def without_timeout
connection.execute("SET STATEMENT_TIMEOUT = 0") unless Rails.env == "test"
yield
ensure
connection.execute("SET STATEMENT_TIMEOUT = #{CurrentUser.user.try(:statement_timeout) || 3_000}") unless Rails.env == "test"
end
def with_timeout(n, default_value = nil, new_relic_params = {})
connection.execute("SET STATEMENT_TIMEOUT = #{n}") unless Rails.env == "test"
yield
rescue ::ActiveRecord::StatementInvalid => x
if Rails.env.production?
NewRelic::Agent.notice_error(x, :custom_params => new_relic_params.merge(:user_id => CurrentUser.id, :user_ip_addr => CurrentUser.ip_addr))
end
return default_value
ensure
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.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

5
config/initializers/postgres_extensions.rb
View File

@@ -1,5 +0,0 @@
module PostgresExtensions
def columns(*params)
super.reject {|x| x.sql_type == "tsvector"}
end
end

2
db/migrate/20170319000519_add_created_at_index_to_versions.rb
View File

@@ -1,6 +1,6 @@
class AddCreatedAtIndexToVersions < ActiveRecord::Migration
def change
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
add_index :note_versions, :created_at
add_index :artist_versions, :created_at
add_index :wiki_page_versions, :created_at

2
db/migrate/20170330230231_add_forum_post_id_to_tag_requests.rb
View File

@@ -1,6 +1,6 @@
class AddForumPostIdToTagRequests < ActiveRecord::Migration
def change
ActiveRecord::Base.without_timeout do
ApplicationRecord.without_timeout do
add_column :tag_aliases, :forum_post_id, :integer
add_column :tag_implications, :forum_post_id, :integer
add_column :bulk_update_requests, :forum_post_id, :integer

2
db/migrate/20170414005856_add_unique_name_constraint_to_users.rb
View File

@@ -1,6 +1,6 @@
class AddUniqueNameConstraintToUsers < ActiveRecord::Migration
def up
ActiveRecord::Base.without_timeout do
User.without_timeout do
remove_index :users, :name
execute "create unique index index_users_on_name on users(lower(name))"
end

2
lib/danbooru/paginator.rb
View File

@@ -3,4 +3,4 @@ require "danbooru/paginator/numbered_collection_extension"
require "danbooru/paginator/sequential_collection_extension"
require "danbooru/paginator/pagination_error"
ActiveRecord::Base.__send__(:include, Danbooru::Paginator::ActiveRecordExtension)
ApplicationRecord.__send__(:include, Danbooru::Paginator::ActiveRecordExtension)

2
script/fixes/046_fix_nicovideo_artist_urls.rb
View File

@@ -2,7 +2,7 @@
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment'))
ActiveRecord::Base.without_timeout do
ArtistUrl.without_timeout do
ArtistUrl.where("normalized_url like ?", "\%nicovideo\%").find_each do |url|
before = url.normalized_url
url.normalize