mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 09:26:54 -06:00
57049b55a2
- Retries on deadlock when calculating average time - Removes Warning: When specifying html format for errors - Doesn't use manual SQL to update user's ip address
42 lines
1.0 KiB
Ruby
42 lines
1.0 KiB
Ruby
class ActiveRecord::Base
|
|
|
|
# Execute SQL manually
|
|
def self.exec_sql(*args)
|
|
conn = ActiveRecord::Base.connection
|
|
sql = ActiveRecord::Base.send(:sanitize_sql_array, args)
|
|
conn.execute(sql)
|
|
end
|
|
|
|
def self.exec_sql_row_count(*args)
|
|
exec_sql(*args).cmd_tuples
|
|
end
|
|
|
|
def exec_sql(*args)
|
|
ActiveRecord::Base.exec_sql(*args)
|
|
end
|
|
|
|
|
|
# Executes the given block +retries+ times (or forever, if explicitly given nil),
|
|
# catching and retrying SQL Deadlock errors.
|
|
#
|
|
# Thanks to: http://stackoverflow.com/a/7427186/165668
|
|
#
|
|
def self.retry_lock_error(retries=5, &block)
|
|
begin
|
|
yield
|
|
rescue ActiveRecord::StatementInvalid => e
|
|
if e.message =~ /Deadlock found when trying to get lock/ and (retries.nil? || retries > 0)
|
|
retry_lock_error(retries ? retries - 1 : nil, &block)
|
|
else
|
|
raise e
|
|
end
|
|
end
|
|
end
|
|
|
|
# Support for psql. If we want to support multiple RDBMs in the future we can
|
|
# split this.
|
|
def exec_sql_row_count(*args)
|
|
exec_sql(*args).cmd_tuples
|
|
end
|
|
|
|
end |