aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/railtie.rb
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2017-06-30 14:05:39 +0900
committerAkira Matsuda <ronnie@dio.jp>2017-07-01 18:38:04 +0900
commit9d4f79d3d394edb74fa2192e5d9ad7b09ce50c6d (patch)
tree9ed7118127fec9c1c991cf28538ecf876fa36868 /activerecord/lib/active_record/railtie.rb
parentee5cfc01a5797f854c8441539b0cae326a81b963 (diff)
downloadrails-9d4f79d3d394edb74fa2192e5d9ad7b09ce50c6d.tar.gz
rails-9d4f79d3d394edb74fa2192e5d9ad7b09ce50c6d.tar.bz2
rails-9d4f79d3d394edb74fa2192e5d9ad7b09ce50c6d.zip
[Active Record] require => require_relative
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
-rw-r--r--activerecord/lib/active_record/railtie.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 73518ca144..9cca103a18 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -48,8 +48,8 @@ module ActiveRecord
# to avoid cross references when loading a constant for the
# first time. Also, make it output to STDERR.
console do |app|
- require "active_record/railties/console_sandbox" if app.sandbox?
- require "active_record/base"
+ require_relative "railties/console_sandbox" if app.sandbox?
+ require_relative "base"
unless ActiveSupport::Logger.logger_outputs_to?(Rails.logger, STDERR, STDOUT)
console = ActiveSupport::Logger.new(STDERR)
Rails.logger.extend ActiveSupport::Logger.broadcast console
@@ -57,7 +57,7 @@ module ActiveRecord
end
runner do
- require "active_record/base"
+ require_relative "base"
end
initializer "active_record.initialize_timezone" do
@@ -101,7 +101,7 @@ module ActiveRecord
initializer "active_record.warn_on_records_fetched_greater_than" do
if config.active_record.warn_on_records_fetched_greater_than
ActiveSupport.on_load(:active_record) do
- require "active_record/relation/record_fetch_warning"
+ require_relative "relation/record_fetch_warning"
end
end
end
@@ -139,7 +139,7 @@ end_warning
# Expose database runtime to controller for logging.
initializer "active_record.log_runtime" do
- require "active_record/railties/controller_runtime"
+ require_relative "railties/controller_runtime"
ActiveSupport.on_load(:action_controller) do
include ActiveRecord::Railties::ControllerRuntime
end