Bring back on_load

config/initializers/access_token_authentication.rb

@@ -1,21 +1,23 @@
 # frozen_string_literal: true
 
 Rails.application.config.after_initialize do
-  if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-    ActiveRecord::ConnectionAdapters::Mysql2Adapter.class_eval do
-      include ApiAuthentication::ByAccessToken::ConnectionExtension
+  ActiveSupport.on_load(:active_record) do
+    if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+      ActiveRecord::ConnectionAdapters::Mysql2Adapter.class_eval do
+        include ApiAuthentication::ByAccessToken::ConnectionExtension
+      end
     end
-  end
 
-  if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.class_eval do
-      include ApiAuthentication::ByAccessToken::OracleEnhancedConnectionExtension
+    if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.class_eval do
+        include ApiAuthentication::ByAccessToken::OracleEnhancedConnectionExtension
+      end
     end
-  end
 
-  if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-    ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
-      include ApiAuthentication::ByAccessToken::ConnectionExtension
+    if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
+        include ApiAuthentication::ByAccessToken::ConnectionExtension
+      end
     end
   end
 end

config/initializers/money.rb

@@ -3,5 +3,7 @@
 Rails.application.config.after_initialize do
   ActionController::Base.helper(ThreeScale::MoneyHelper)
 
-  ActiveRecord::Base.include ThreeScale::HasMoney
+  ActiveSupport.on_load(:active_record) do
+    ActiveRecord::Base.include ThreeScale::HasMoney
+  end
 end