Merge pull request #446 from floriandejonckheere/master

Deprecate ActiveRecord::Base.default_timezone
gocardless · Feb 4, 2022 · 16207a9 · 16207a9
2 parents b226cdf + ae32e99
commit 16207a9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/statesman/adapters/active_record.rb b/lib/statesman/adapters/active_record.rb
@@ -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