From 59f3218463228ca2301857cd7bf4f82f308924a6 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 21 Jan 2011 17:53:28 -0800 Subject: load and prefer psych as the YAML parser when it is available --- railties/lib/rails/commands/dbconsole.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'railties/lib/rails/commands/dbconsole.rb') diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index 14d245ab2e..300fd6da05 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -1,4 +1,10 @@ require 'erb' + +begin + require 'psych' +rescue LoadError +end + require 'yaml' require 'optparse' require 'rbconfig' -- cgit v1.2.3 From 2e11213d62f25d41ccf77b3d0f5b69aad0bf165b Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Sun, 16 Jan 2011 07:47:41 +0900 Subject: "rails dbconsole t" must not load "production" but "test" [#6293 state:committed] Signed-off-by: Santiago Pastorino --- railties/lib/rails/commands/dbconsole.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/commands/dbconsole.rb') diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index 300fd6da05..9dbc1699ee 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -119,5 +119,5 @@ end # Has to set the RAILS_ENV before config/application is required if ARGV.first && !ARGV.first.index("-") && env = ARGV.first - ENV['RAILS_ENV'] = %w(production development test).find { |e| e.index(env) } || env + ENV['RAILS_ENV'] = %w(production development test).detect {|e| e =~ /^#{env}/} || env end -- cgit v1.2.3 From 8a85f64abffde29ddfd521d63d566f98796ae400 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Thu, 16 Dec 2010 22:03:01 +0900 Subject: Accept 'postgres' as a PostgreSQL driver name in dbconsole for non-AR ORMs like DataMapper and Sequel [#6180 state:committed] Signed-off-by: Santiago Pastorino --- railties/lib/rails/commands/dbconsole.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/commands/dbconsole.rb') diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index 9dbc1699ee..f0d6ea1687 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -80,7 +80,7 @@ module Rails exec(find_cmd('mysql', 'mysql5'), *args) - when "postgresql" + when "postgresql", "postgres" ENV['PGUSER'] = config["username"] if config["username"] ENV['PGHOST'] = config["host"] if config["host"] ENV['PGPORT'] = config["port"].to_s if config["port"] -- cgit v1.2.3