From 05ec99eed9813a497426432fb9ecc38379bc4b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com> Date: Tue, 23 Mar 2010 14:12:58 +0100 Subject: bin/rails should use the new app generator path. --- railties/lib/rails/commands/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/commands') 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 -- cgit v1.2.3 From 0848c862f098d5fcaa0e11f979a4ce4a2139f6c0 Mon Sep 17 00:00:00 2001 From: Edgars Beigarts <ebeigarts@alise.lv> Date: Fri, 22 Jan 2010 22:58:31 +0200 Subject: Make script/dbconsole work with oracle (sqlplus <username>[/<password>][@<connect_identifier>]) [#3773 state:resolved] --- railties/lib/rails/commands/dbconsole.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'railties/lib/rails/commands') 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 -- cgit v1.2.3