aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-16 15:12:21 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-16 15:12:21 -0200
commitefbbb305348ac10450446ba5c3a952276ce54d0a (patch)
tree03926e3343da502aba55be626cb6ef3fccf457a5 /railties
parent3bdd110dfedb2b8c208f32e045919f6d80fe3d14 (diff)
parent17bb531f82b33a8c6365f73f7577ee1f3a37ef1a (diff)
downloadrails-efbbb305348ac10450446ba5c3a952276ce54d0a.tar.gz
rails-efbbb305348ac10450446ba5c3a952276ce54d0a.tar.bz2
rails-efbbb305348ac10450446ba5c3a952276ce54d0a.zip
Merge pull request #18049 from yuki3738/fix_rails_db_command_error
Add a code checking about file or not to the rails db command
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/commands/dbconsole.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 9014560611..0d8b3de0eb 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -178,7 +178,7 @@ module Rails
found = commands.detect do |cmd|
dirs_on_path.detect do |path|
full_path_command = File.join(path, cmd)
- File.executable? full_path_command
+ File.file?(full_path_command) && File.executable?(full_path_command)
end
end