Skip to content

Commit

Permalink
Check for deprecated ActiveRecord::Base.default_timezone
Browse files Browse the repository at this point in the history
  • Loading branch information
floriandejonckheere committed Dec 24, 2021
1 parent b226cdf commit ae32e99
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion lib/statesman/adapters/active_record.rb
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,17 @@ def updated_column_and_timestamp
return nil if column.nil?

[
column, ::ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
column, default_timezone == :utc ? Time.now.utc : Time.now
]
end

def default_timezone
# Rails 7 deprecates ActiveRecord::Base.default_timezone in favour of ActiveRecord.default_timezone
return ::ActiveRecord.default_timezone if ::ActiveRecord.respond_to?(:default_timezone)

::ActiveRecord::Base.default_timezone
end

def mysql_gaplock_protection?
Statesman.mysql_gaplock_protection?
end
Expand Down

0 comments on commit ae32e99

Please sign in to comment.