Permalink
Browse files

Some dbconsole tweaks. [#102 state:resolved]

  • Loading branch information...
jeremy committed May 7, 2008
1 parent b510d8b commit 2561732a08ae97fa44706a8eca4db147c4a7c286
Showing with 26 additions and 20 deletions.
  1. +26 −20 railties/lib/commands/dbconsole.rb
@@ -1,49 +1,55 @@
require 'yaml'
require 'optparse'
OptionParser.new do |opt|
opt.banner = "Usage: dbconsole [environment]"
opt.parse!(ARGV)
abort opt.to_s unless (0..1).include?(ARGV.size)
end
env = ENV['RAILS_ENV'] = ARGV.first || ENV['RAILS_ENV'] || 'development'
env = ARGV.first || ENV['RAILS_ENV'] || 'development'
unless config = YAML.load_file(RAILS_ROOT + "/config/database.yml")[env]
abort "No database is configured for the environment '#{env}'"
end
def find_cmd(*commands)
dirs_on_path = ENV['PATH'].split(File::PATH_SEPARATOR)
dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/
commands.detect do |cmd|
dirs_on_path.detect do |path|
File.executable? File.join(path, cmd)
end
end || abort("couldn't find matching executable: #{commands.join(', ')}")
end || abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
end
case config["adapter"]
when "mysql"
args = {
'host' => '--host',
'port' => '--port',
'socket' => '--socket',
'username' => '--user',
'password' => '--password',
'encoding' => '--default-character-set'
}.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
require 'yaml'
config = YAML::load(File.read(RAILS_ROOT + "/config/database.yml"))[env]
args << config['database']
unless config
abort "No database is configured for the environment '#{env}'"
end
exec(find_cmd('mysql5', 'mysql'), *args)
case config["adapter"]
when "mysql"
exec(find_cmd(*%w(mysql5 mysql)),
*({ 'host' => '--host',
'port' => '--port',
'socket' => '--socket',
'username' => '--user',
'password' => '--password',
'encoding' => '--default-character-set'
}.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact +
[config['database']]))
when "postgresql"
ENV['PGHOST'] = config["host"] if config["host"]
ENV['PGPORT'] = config["port"].to_s if config["port"]
ENV['PGPASSWORD'] = config["password"].to_s if config["password"]
exec(find_cmd('psql'), '-U', config["username"], config["database"])
when "sqlite"
exec(find_cmd('sqlite'), config["database"])
when "sqlite3"
exec(find_cmd('sqlite3'), config["database"])
else abort "not supported for this database type"
else
abort "Unknown command-line client for #{config['database']}. Submit a Rails patch to add support!"
end

0 comments on commit 2561732

Please sign in to comment.