Upgrade to Rails 2.2.0
As a side benefit, fix an (non-user-visible) bug in display_s5(). Also fixed a bug where removing orphaned pages did not expire cached summary pages.
This commit is contained in:
parent
39348c65c2
commit
7600aef48b
827 changed files with 123652 additions and 11027 deletions
|
@ -6,7 +6,7 @@ include_password = false
|
|||
|
||||
OptionParser.new do |opt|
|
||||
opt.banner = "Usage: dbconsole [options] [environment]"
|
||||
opt.on("-p", "--include-password", "Automatically provide the database from database.yml") do |v|
|
||||
opt.on("-p", "--include-password", "Automatically provide the password from database.yml") do |v|
|
||||
include_password = true
|
||||
end
|
||||
opt.parse!(ARGV)
|
||||
|
@ -47,7 +47,7 @@ when "mysql"
|
|||
|
||||
args << config['database']
|
||||
|
||||
exec(find_cmd('mysql5', 'mysql'), *args)
|
||||
exec(find_cmd('mysql', 'mysql5'), *args)
|
||||
|
||||
when "postgresql"
|
||||
ENV['PGUSER'] = config["username"] if config["username"]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue