Merge branch 'master' into docrails

2 files changed, 13 insertions, 1 deletions

diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index fe2f89ee98..438c976b35 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -8,6 +8,6 @@ ARGV << "--help"   if ARGV.empty?
 require 'rubygems' if ARGV.include?("--dev")
 
 require 'rails/generators'
-require 'generators/rails/app/app_generator'
+require 'rails/generators/rails/app/app_generator'
 
 Rails::Generators::AppGenerator.start
\ No newline at end of file
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 593e2d8ee3..68982b9f52 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -91,6 +91,18 @@ module Rails
         args << config['database']
 
         exec(find_cmd('sqlite3'), *args)
+
+      when "oracle", "oracle_enhanced"
+        logon = ""
+
+        if config['username']
+          logon = config['username']
+          logon << "/#{config['password']}" if config['password'] && include_password
+          logon << "@#{config['database']}" if config['database']
+        end
+
+        exec(find_cmd('sqlplus'), logon)
+
       else
         abort "Unknown command-line client for #{config['database']}. Submit a Rails patch to add support!"
       end