From 55850818e36dce98061c3bbc56b41134f8f0e413 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 25 Jun 2005 11:19:47 +0000 Subject: Fixed rakefile actions against PostgreSQL when the password is all numeric #1462 [michael@schubert.cx] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1508 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/CHANGELOG | 2 ++ railties/fresh_rakefile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 58a69dbef7..0585769622 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed rakefile actions against PostgreSQL when the password is all numeric #1462 [michael@schubert.cx] + * ActionMailer::Base subclasses are reloaded with the other rails components #1262 * Made the WEBrick adapter not use a mutex around action performance if ActionController::Base.allow_concurrency is true (default is false) diff --git a/railties/fresh_rakefile b/railties/fresh_rakefile index 4219192034..62e913aa4f 100755 --- a/railties/fresh_rakefile +++ b/railties/fresh_rakefile @@ -131,7 +131,7 @@ task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do when "postgresql" ENV['PGHOST'] = abcs["test"]["host"] if abcs["test"]["host"] ENV['PGPORT'] = abcs["test"]["port"].to_s if abcs["test"]["port"] - ENV['PGPASSWORD'] = abcs["test"]["password"] + ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"] `psql -U "#{abcs["test"]["username"]}" -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}` when "sqlite", "sqlite3" `#{abcs[RAILS_ENV]["adapter"]} #{abcs["test"]["dbfile"]} < db/#{RAILS_ENV}_structure.sql` @@ -150,7 +150,7 @@ task :db_structure_dump => :environment do when "postgresql" ENV['PGHOST'] = abcs[RAILS_ENV]["host"] if abcs[RAILS_ENV]["host"] ENV['PGPORT'] = abcs[RAILS_ENV]["port"].to_s if abcs[RAILS_ENV]["port"] - ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"] + ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"].to_s if abcs[RAILS_ENV]["password"] `pg_dump -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{abcs[RAILS_ENV]["database"]}` when "sqlite", "sqlite3" `#{abcs[RAILS_ENV]["adapter"]} #{abcs[RAILS_ENV]["dbfile"]} .schema > db/#{RAILS_ENV}_structure.sql` @@ -169,7 +169,7 @@ task :purge_test_database => :environment do when "postgresql" ENV['PGHOST'] = abcs["test"]["host"] if abcs["test"]["host"] ENV['PGPORT'] = abcs["test"]["port"].to_s if abcs["test"]["port"] - ENV['PGPASSWORD'] = abcs["test"]["password"] + ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"] `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}` `createdb -T template0 -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}` when "sqlite","sqlite3" @@ -185,4 +185,4 @@ task :clear_logs => :environment do f = File.open(log_file, "w") f.close end -end \ No newline at end of file +end -- cgit v1.2.3