1 files changed, 4 insertions, 6 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 0d8b3de0eb..3b22b582cf 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -1,7 +1,6 @@
 require 'erb'
 require 'yaml'
 require 'optparse'
-require 'rbconfig'
 
 module Rails
   class DBConsole
@@ -51,9 +50,6 @@ module Rails
         ENV['PGPASSWORD'] = config["password"].to_s if config["password"] && options['include_password']
         find_cmd_and_exec('psql', config["database"])
 
-      when "sqlite"
-        find_cmd_and_exec('sqlite', config["database"])
-
       when "sqlite3"
         args = []
 
@@ -90,7 +86,7 @@ module Rails
         find_cmd_and_exec("sqsh", *args)
 
       else
-        abort "Unknown command-line client for #{config['database']}. Submit a Rails patch to add support!"
+        abort "Unknown command-line client for #{config['database']}."
       end
     end
 
@@ -172,7 +168,9 @@ module Rails
       commands = Array(commands)
 
       dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
-      commands += commands.map{|cmd| "#{cmd}.exe"} if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+      unless (ext = RbConfig::CONFIG['EXEEXT']).empty?
+        commands = commands.map{|cmd| "#{cmd}#{ext}"}
+      end
 
       full_path_command = nil
       found = commands.detect do |cmd|