diff options
author | Xavier Noria <fxn@hashref.com> | 2017-07-02 14:35:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-02 14:35:13 -0700 |
commit | 111736ddf6fe81f3e42af37dfa1b0520a8c91473 (patch) | |
tree | 050eea5a719faa416b64b804617f8755b6500e09 /activerecord/lib/active_record/tasks | |
parent | f443460670576cd82a806a851b7124479e8325c9 (diff) | |
parent | 92c29d82eb2f323bb1338a039229a66057a7d137 (diff) | |
download | rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.tar.gz rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.tar.bz2 rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.zip |
Merge pull request #29638 from amatsuda/require_relative_2017
Using require_relative in the Rails codebase
Diffstat (limited to 'activerecord/lib/active_record/tasks')
-rw-r--r-- | activerecord/lib/active_record/tasks/mysql_database_tasks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb index 88cbd6f6f5..ff6745f7b5 100644 --- a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb +++ b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb @@ -99,7 +99,7 @@ module ActiveRecord def error_class if configuration["adapter"].include?("jdbc") - require "active_record/railties/jdbcmysql_error" + require_relative "../railties/jdbcmysql_error" ArJdbcMySQL::Error elsif defined?(Mysql2) Mysql2::Error |