Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate ActiveRecord::Base.default_timezone #446

Merged
merged 1 commit into from
Feb 4, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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