From 16287608bb6836924dc210a62b1c7e70a58ea94c Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 20 Mar 2005 16:55:39 +0000 Subject: More postgresql rakefile tweaking #875 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@938 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/CHANGELOG | 8 ++++++-- railties/fresh_rakefile | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'railties') diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 4396def23e..b52ea3b099 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -2,9 +2,13 @@ * Fixed webrick_server cookie handling to allow multiple cookes to be set at once #800, #813 [dave@cherryville.org] -* Fixed the Rakefile's interaction with postgresql use PGPASSWORD and PGHOST in the environment to fix prompting for passwords when connecting to a remote db and local socket connections. Also added a '-x' flag to pg_dump which stops it dumping privileges #807 [rasputnik] +* Fixed the Rakefile's interaction with postgresql to: -* Fixed the Rakefile's interaction with postgresql to quote the user name and use template0 when dumping so the functions doesn't get dumped too #855 [pburleson] + 1. Use PGPASSWORD and PGHOST in the environment to fix prompting for + passwords when connecting to a remote db and local socket connections. + 2. Added a '-x' flag to pg_dump which stops it dumping privileges #807 [rasputnik] + 3. Quote the user name and use template0 when dumping so the functions doesn't get dumped too #855 [pburleson] + 4. Use the port if available #875 [madrobby] *0.10.1* (7th March, 2005) diff --git a/railties/fresh_rakefile b/railties/fresh_rakefile index 40878d3e71..da3761d799 100755 --- a/railties/fresh_rakefile +++ b/railties/fresh_rakefile @@ -121,6 +121,7 @@ task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do end when "postgresql" ENV['PGHOST'] = abcs["test"]["host"] if abcs["test"]["host"] + ENV['PGPORT'] = abcs["test"]["host"] if abcs["test"]["port"] ENV['PGPASSWORD'] = abcs["test"]["password"] `psql -U "#{abcs["test"]["username"]}" -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}` when "sqlite", "sqlite3" @@ -139,6 +140,7 @@ task :db_structure_dump => :environment do File.open("db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump } when "postgresql" ENV['PGHOST'] = abcs[RAILS_ENV]["host"] if abcs[RAILS_ENV]["host"] + ENV['PGPORT'] = abcs[RAILS_ENV]["host"] if abcs[RAILS_ENV]["port"] ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"] `pg_dump -U "#{abcs[RAILS_ENV]["username"]}" -s -x -f db/#{RAILS_ENV}_structure.sql #{abcs[RAILS_ENV]["database"]}` when "sqlite", "sqlite3" @@ -157,6 +159,7 @@ task :purge_test_database => :environment do ActiveRecord::Base.connection.recreate_database(abcs["test"]["database"]) when "postgresql" ENV['PGHOST'] = abcs["test"]["host"] if abcs["test"]["host"] + ENV['PGPORT'] = abcs["test"]["host"] if abcs["test"]["port"] ENV['PGPASSWORD'] = abcs["test"]["password"] `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}` `createdb -T template0 -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}` -- cgit v1.2.3