diff options
| author | wycats <wycats@gmail.com> | 2010-04-26 23:32:30 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-26 23:32:30 -0700 |
| commit | 91963e9e33eb5a28297323f1346aeb8b643e9d65 (patch) | |
| tree | 0452dbaf63110fb5a19c958da50d4677dee11333 /railties/lib/rails/commands/dbconsole.rb | |
| parent | d5d717161d853d8d7240da59b41a879bdac6e982 (diff) | |
| parent | c1d73270717f30498f8f4d55d6695509107c2834 (diff) | |
| download | rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.tar.gz rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.tar.bz2 rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/commands/dbconsole.rb')
| -rw-r--r-- | railties/lib/rails/commands/dbconsole.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index 68982b9f52..8957f11724 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -1,6 +1,7 @@ require 'erb' require 'yaml' require 'optparse' +require 'rbconfig' module Rails class DBConsole @@ -41,7 +42,7 @@ module Rails def find_cmd(*commands) dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR) - commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/ + commands += commands.map{|cmd| "#{cmd}.exe"} if Config::CONFIG['host_os'] =~ /mswin|mingw/ full_path_command = nil found = commands.detect do |cmd| |